- backend update from GZDoom

ZDoom · Apr 20, 2024 · 30e9cb7 · 30e9cb7
1 parent d2b2092
commit 30e9cb7
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 2 deletions.
diff --git a/source/common/filesystem/source/fs_findfile.cpp b/source/common/filesystem/source/fs_findfile.cpp
@@ -40,6 +40,9 @@
 
 #include <limits.h>
 #include <stdlib.h>
+#ifdef __FreeBSD__
+#include <sys/time.h>
+#endif
 #include <unistd.h>
 #include <fnmatch.h>
 #include <sys/stat.h>

diff --git a/source/common/objects/dobjtype.cpp b/source/common/objects/dobjtype.cpp
@@ -667,6 +667,8 @@ PClass *PClass::FindClassTentative(FName name)
 //
 //==========================================================================
 
+bool ShouldAllowGameSpecificVirtual(FName name, unsigned index, PType* arg, PType* varg);
+
 int PClass::FindVirtualIndex(FName name, PFunction::Variant *variant, PFunction *parentfunc, bool exactReturnType, bool ignorePointerReadOnly)
 {
 	auto proto = variant->Proto;
@@ -698,7 +700,7 @@ int PClass::FindVirtualIndex(FName name, PFunction::Variant *variant, PFunction
 							break;
 						}
 					}
-					else
+					else if(!ShouldAllowGameSpecificVirtual(name, a, proto->ArgumentTypes[a], vproto->ArgumentTypes[a]))
 					{
 						fail = true;
 						break;

diff --git a/source/common/scripting/backend/codegen.cpp b/source/common/scripting/backend/codegen.cpp
@@ -12564,7 +12564,14 @@ FxExpression *FxLocalVariableDeclaration::Resolve(FCompileContext &ctx)
 		{
 			if (Init->IsStruct())
 			{
-				ValueType = NewPointer(ValueType);
+				bool writable = true;
+
+				if(ctx.Version >= MakeVersion(4, 12, 0))
+				{
+					Init->RequestAddress(ctx, &writable);
+				}
+
+				ValueType = NewPointer(ValueType, !writable);
 				Init = new FxTypeCast(Init, ValueType, false);
 				SAFE_RESOLVE(Init, ctx);
 			}