SecBSD/ports
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

sync ports with The Matrix

Browse source
This commit is contained in:
purplerain 2023-09-25 03:11:29 +00:00
parent 0c63ea14ee
commit 137b59ed88
Signed by: purplerain
GPG key ID: F42C07F07E2E35B7
37 changed files with 2146 additions and 154 deletions
Download patch file Download diff file Expand all files Collapse all files

28
games/godot/patches/patch-modules_mono_csharp_script_cpp Normal file
View file

@ -0,0 +1,28 @@
fix error: cannot initialize return object of type 'bool' with
an rvalue of type 'nullptr_t'
Index: modules/mono/csharp_script.cpp
--- modules/mono/csharp_script.cpp.orig
+++ modules/mono/csharp_script.cpp
@@ -2310,7 +2310,7 @@ bool CSharpScript::_update_exports(PlaceHolderScriptIn
GDMonoMethod *ctor = script_class->get_method(CACHED_STRING_NAME(dotctor), 0);
- ERR_FAIL_NULL_V_MSG(ctor, NULL,
+ ERR_FAIL_NULL_V_MSG(ctor, false,
"Cannot construct temporary MonoObject because the class does not define a parameterless constructor: '" + get_path() + "'.");
MonoException *ctor_exc = NULL;
@@ -2891,10 +2891,10 @@ bool CSharpScript::can_instance() const {
if (extra_cond && !script_class) {
if (GDMono::get_singleton()->get_project_assembly() == NULL) {
// The project assembly is not loaded
- ERR_FAIL_V_MSG(NULL, "Cannot instance script because the project assembly is not loaded. Script: '" + get_path() + "'.");
+ ERR_FAIL_V_MSG(false, "Cannot instance script because the project assembly is not loaded. Script: '" + get_path() + "'.");
} else {
// The project assembly is loaded, but the class could not found
- ERR_FAIL_V_MSG(NULL, "Cannot instance script because the class '" + name + "' could not be found. Script: '" + get_path() + "'.");
+ ERR_FAIL_V_MSG(false, "Cannot instance script because the class '" + name + "' could not be found. Script: '" + get_path() + "'.");
}
}