Fixed compiler bug (thanks misomosi)

Freeeaky · May 23, 2015 · d7f25aa · d7f25aa
1 parent 67113a6
commit d7f25aa
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 1 deletion.
diff --git a/src/GTALua/API.cpp b/src/GTALua/API.cpp
@@ -3,6 +3,7 @@
 // =================================================================================
 #include "Includes.h"
 #include "GTALua.h"
+#include "ScriptEngine/ScriptEngine.h"
 #include "Memory/Memory.h"
 #include "lua/Lua.h"
 #include "thirdparty/ScriptHookV/ScriptHookV.h"

diff --git a/src/GTALua/ScriptBinds/LB_ScriptHookV.cpp b/src/GTALua/ScriptBinds/LB_ScriptHookV.cpp
@@ -134,7 +134,7 @@ void ScriptBinds::ScriptHookBind::Bind()
 		luabind::def("InitNative", LB_InitNative),
 		luabind::def("NativePushInt", ScriptHook::PushValue<__int32>),
 		luabind::def("NativePushFloat", ScriptHook::PushValue<float>),
-		luabind::def("NativePushVector", ScriptHook::PushValue<rage::CVector>),
+		luabind::def("NativePushVector", ScriptHook::PushVector),
 		luabind::def("NativePushBool", ScriptHook::PushValue<bool>),
 		luabind::def("NativePushString", ScriptHook::PushValue<const char*>),
 		luabind::def("NativePushMemoryBlock", ScriptHook::PushMemory),

diff --git a/src/GTALua/ScriptBinds/LB_ScriptThread.cpp b/src/GTALua/ScriptBinds/LB_ScriptThread.cpp
@@ -5,6 +5,7 @@
 #include "GTALua.h"
 #include "lua/Lua.h"
 #include "ScriptBinds.h"
+#include "ScriptEngine/ScriptEngine.h"
 #include "thirdparty/ScriptHookV/ScriptHookV.h"
 #include "UTIL/UTIL.h"
 using namespace ScriptBinds::ScriptThread;

diff --git a/src/GTALua/thirdparty/ScriptHookV/ScriptHookV.h b/src/GTALua/thirdparty/ScriptHookV/ScriptHookV.h
@@ -31,6 +31,12 @@ namespace ScriptHook
 		*reinterpret_cast<T *>(&val64) = val;
 		NativePush64(val64);
 	}
+	static inline void PushVector(rage::CVector vec)
+	{
+		PushValue(vec.x);
+		PushValue(vec.y);
+		PushValue(vec.z);
+	}
 
 	// Call Wrapper
 	template <typename T>