From 056fd51e967bd8f6937dd555e71d36be14d6830b Mon Sep 17 00:00:00 2001 From: Warmist Date: Mon, 8 Aug 2011 23:38:09 +0300 Subject: [PATCH] lua file fixes for linux (hopefully does not break windows) --- plugins/Dfusion/luafiles/common.lua | 10 ++++++---- plugins/Dfusion/luafiles/init.lua | 3 +++ 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/plugins/Dfusion/luafiles/common.lua b/plugins/Dfusion/luafiles/common.lua index 200621b82..343877ef8 100644 --- a/plugins/Dfusion/luafiles/common.lua +++ b/plugins/Dfusion/luafiles/common.lua @@ -3,9 +3,9 @@ STD_STRING=0 DWORD=1 WORD=2 BYTE=3 - function GetTextRegion() ranges__=ranges__ or 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))) @@ -15,8 +15,10 @@ function GetTextRegion() --if(v["read"])then num=num+1 end --if(v["write"])then num=num+10 end --if(v["execute"]) then num=num+100 end - --print(string.format("%d %x->%x %s %d",k,v["start"],v["end"],v.name,num)) - local pos=string.find(v.name,".text") + --if num>=100 then + --print(string.format("%d %x->%x %s %d",k,v["start"],v["end"],v.name or "",num)) + --end + local pos=string.find(v.name,".text") or string.find(v.name,"libs/Dwarf_Fortress") if(pos~=nil) then return v; end @@ -472,4 +474,4 @@ function Allocate(size) end dofile("dfusion/patterns.lua") dofile("dfusion/patterns2.lua") -dofile("dfusion/itempatterns.lua") \ No newline at end of file +dofile("dfusion/itempatterns.lua") diff --git a/plugins/Dfusion/luafiles/init.lua b/plugins/Dfusion/luafiles/init.lua index 9eb595641..d8307eaab 100644 --- a/plugins/Dfusion/luafiles/init.lua +++ b/plugins/Dfusion/luafiles/init.lua @@ -1,3 +1,6 @@ +function print(msg) + Console.print(msg.."\n") +end function err(msg) --make local maybe... print(msg) print(debug.traceback())