diff --git a/plugins/Dfusion/dfusion.cpp b/plugins/Dfusion/dfusion.cpp index 84f66138c..120e3fce6 100644 --- a/plugins/Dfusion/dfusion.cpp +++ b/plugins/Dfusion/dfusion.cpp @@ -46,7 +46,7 @@ DFhackCExport command_result plugin_init ( Core * c, std::vector lua::state st=lua::glua::Get(); //maybe remake it to run automaticaly lua::RegisterConsole(st); - lua::RegisterProcess(st,c->p); + lua::RegisterProcess(st); lua::RegisterHexsearch(st); lua::RegisterMisc(st); lua::RegisterVersionInfo(st); diff --git a/plugins/Dfusion/include/lua_Process.h b/plugins/Dfusion/include/lua_Process.h index e6639cfc8..3429c9518 100644 --- a/plugins/Dfusion/include/lua_Process.h +++ b/plugins/Dfusion/include/lua_Process.h @@ -8,6 +8,6 @@ namespace lua { -void RegisterProcess(lua::state &st,DFHack::Process *p); +void RegisterProcess(lua::state &st); } #endif \ No newline at end of file diff --git a/plugins/Dfusion/luafiles/common.lua b/plugins/Dfusion/luafiles/common.lua index 4548acecf..2b706b7f7 100644 --- a/plugins/Dfusion/luafiles/common.lua +++ b/plugins/Dfusion/luafiles/common.lua @@ -19,9 +19,9 @@ function GetTextRegion() ranges__=Process.getMemRanges() --print("Ranges:"..#ranges__) for k,v in pairs(ranges__) do - --for k2,v2 in pairs(v) do - -- print(string.format("%d %s->%s",k,tostring(k2),tostring(v2))) - --end + for k2,v2 in pairs(v) do + --print(string.format("%d %s->%s",k,tostring(k2),tostring(v2))) + end --local num --flgs="" --if(v["read"])then flgs=flgs..'r' end diff --git a/plugins/Dfusion/luafiles/xml_struct.lua b/plugins/Dfusion/luafiles/xml_struct.lua index 7baa5c48a..5c2cb9b26 100644 --- a/plugins/Dfusion/luafiles/xml_struct.lua +++ b/plugins/Dfusion/luafiles/xml_struct.lua @@ -40,7 +40,7 @@ function parseTree(t) end function parseTreeGlobals(t) local glob={} - print("Parsing global-objects") + --print("Parsing global-objects") for k,v in ipairs(t) do if v.xarg~=nil and v.label=="ld:global-object" then local name=v.xarg["name"]; diff --git a/plugins/Dfusion/src/lua_Process.cpp b/plugins/Dfusion/src/lua_Process.cpp index 6d2b3d877..19bf698d1 100644 --- a/plugins/Dfusion/src/lua_Process.cpp +++ b/plugins/Dfusion/src/lua_Process.cpp @@ -2,12 +2,7 @@ static DFHack::Process* GetProcessPtr(lua::state &st) { - int t=st.gettop(); - st.getglobal("Process"); - st.getfield("__pointer"); - DFHack::Process* c=static_cast(lua_touserdata(st,-1)); - st.settop(t); - return c; + return DFHack::Core::getInstance().p; } static int lua_Process_readDWord(lua_State *S) @@ -275,7 +270,7 @@ const luaL_Reg lua_process_func[]= {NULL,NULL} }; #undef PROC_FUNC -void lua::RegisterProcess(lua::state &st,DFHack::Process *p) +void lua::RegisterProcess(lua::state &st) { st.getglobal("Process"); if(st.is()) @@ -284,9 +279,6 @@ void lua::RegisterProcess(lua::state &st,DFHack::Process *p) st.newtable(); } - st.pushlightuserdata(p); - st.setfield("__pointer"); - lua::RegFunctionsLocal(st, lua_process_func); st.setglobal("Process");