Fix compilation errors

wopss · Sep 27, 2023 · 43b181a · 43b181a
1 parent c75d32b
commit 43b181a
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 2 deletions.
diff --git a/examples/native_globals_redscript/Main.cpp b/examples/native_globals_redscript/Main.cpp
@@ -31,13 +31,14 @@ void SummonVehiclePlease(RED4ext::IScriptable* aContext, RED4ext::CStackFrame* a
         auto getQuickSlotsManagerFunc = playerPuppetCls->GetFunction("GetQuickSlotsManager");
 
         RED4ext::Handle<RED4ext::IScriptable> quickSlotManager;
+
         // Execute the function on our Player instance
-        RED4ext::ExecuteFunction(handle, getQuickSlotsManagerFunc, &quickSlotManager, {});
+        RED4ext::ExecuteFunction(handle, getQuickSlotsManagerFunc, &quickSlotManager);
 
         auto quickSlotsManagerCls = rtti->GetClass("QuickSlotsManager ");
         auto summonVehicleFunc = quickSlotsManagerCls->GetFunction("SummonVehicle");
 
-        RED4ext::ExecuteFunction(quickSlotManager, summonVehicleFunc, nullptr, {});
+        RED4ext::ExecuteFunction(quickSlotManager, summonVehicleFunc, nullptr);
     }
 }
 

diff --git a/include/RED4ext/Scripting/Utils-inl.hpp b/include/RED4ext/Scripting/Utils-inl.hpp
@@ -11,6 +11,12 @@
 #include <RED4ext/Scripting/Functions.hpp>
 #include <RED4ext/Scripting/IScriptable.hpp>
 
+RED4EXT_INLINE bool RED4ext::ExecuteFunction(ScriptInstance aInstance, CBaseFunction* aFunc, void* aOut)
+{
+    StackArgs_t args;
+    return ExecuteFunction(aInstance, aFunc, aOut, args);
+}
+
 RED4EXT_INLINE bool RED4ext::ExecuteFunction(ScriptInstance aInstance, CBaseFunction* aFunc, void* aOut,
                                              StackArgs_t& aArgs)
 {

diff --git a/include/RED4ext/Scripting/Utils.hpp b/include/RED4ext/Scripting/Utils.hpp
@@ -12,6 +12,7 @@ namespace RED4ext
 struct CBaseFunction;
 struct CClass;
 
+bool ExecuteFunction(ScriptInstance aInstance, CBaseFunction* aFunc, void* aOut);
 bool ExecuteFunction(ScriptInstance aInstance, CBaseFunction* aFunc, void* aOut, StackArgs_t& aArgs);
 
 bool ExecuteFunction(CClass* aContext, CBaseFunction* aFunc, void* aOut, StackArgs_t& aArgs);

diff --git a/include/RED4ext/TweakDB.hpp b/include/RED4ext/TweakDB.hpp
@@ -134,6 +134,7 @@ struct TweakDB
             return &data;
         }
 
+#pragma warning(suppress : 4324)
         T data;
     };
     using QuaternionFlatValue = FlatValueImpl<Quaternion, CName("Quaternion")>;
-Original file line number
+Diff line change
@@ Expand Up / @@ -134,6 +134,7 @@ struct TweakDB @@
                 return &data;
             }
+    #pragma warning(suppress : 4324)
             T data;
         };
         using QuaternionFlatValue = FlatValueImpl<Quaternion, CName("Quaternion")>;
@@ Expand Down @@