From 25b689b7786fee4f47973fbbc36889a0a9ff6d35 Mon Sep 17 00:00:00 2001 From: Warmist Date: Thu, 25 Aug 2011 07:22:31 +0300 Subject: [PATCH] Fixes so that windows ver would build (and work) --- plugins/Dfusion/luafiles/friendship/patch.lua | 2 +- plugins/Dfusion/src/lua_Misc.cpp | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/plugins/Dfusion/luafiles/friendship/patch.lua b/plugins/Dfusion/luafiles/friendship/patch.lua index 6707e4155..0ae236dc5 100644 --- a/plugins/Dfusion/luafiles/friendship/patch.lua +++ b/plugins/Dfusion/luafiles/friendship/patch.lua @@ -1,6 +1,6 @@ function friendship_in.patch() pos=GetTextRegion().start - local crace=add_race --offsets.getEx("CurrentRace") + local crace=VersionInfo.getGroup("Creatures"):getAddress("current_race") hits={} i=1 repeat diff --git a/plugins/Dfusion/src/lua_Misc.cpp b/plugins/Dfusion/src/lua_Misc.cpp index be1de4a24..269f38ee9 100644 --- a/plugins/Dfusion/src/lua_Misc.cpp +++ b/plugins/Dfusion/src/lua_Misc.cpp @@ -129,7 +129,11 @@ static int GetMod(lua_State *L) st.push(pos); return 1; } +#ifdef LINUX_BUILD static size_t __attribute__((stdcall)) PushValue(size_t ret,uint32_t eax,uint32_t ebx,uint32_t ecx,uint32_t edx,uint32_t edi,uint32_t esi,uint32_t esp,uint32_t ebp) +#else +static size_t __stdcall PushValue(size_t ret,uint32_t eax,uint32_t ebx,uint32_t ecx,uint32_t edx,uint32_t edi,uint32_t esi,uint32_t esp,uint32_t ebp) +#endif { lua::state st=lua::glua::Get(); st.getglobal("OnFunction");