Merge remote-tracking branch 'warmist/master'

plugins/Dfusion/luafiles/friendship/init.lua

@@ -14,9 +14,9 @@ function analyzeF(off)
 		return pos
 	end
 end
-function minEx(...)
-	local imin=arg[1]
-	for _,v in ipairs(arg) do
+function minEx(list)
+	local imin=list[1]
+	for _,v in ipairs(list) do
 		if imin> v and v~=0 then
 			imin=v
 		end

plugins/Dfusion/luafiles/friendship/patch.lua

@@ -11,8 +11,7 @@ function friendship_in.patch()
 		pos3=offsets.find(pos+7,0xa1,DWORD_,crace) -- mov eax,[ptr]
 		pos4=offsets.find(pos+7,0x66,0x8b,ANYBYTE,DWORD_,crace) -- mov ANYREG,[ptr]
 		--pos5=offsets.find(pos+7,0x66,0x8b,0x15,DWORD_,crace) -- mov dx,[ptr]
-
-		pos=minEx(pos1,pos2,pos3,pos4)
+		pos=minEx{pos1,pos2,pos3,pos4}
 		if pos ~=0 then 
 			hits[i]=pos
 			i=i+1
@@ -28,7 +27,7 @@ function friendship_in.patch()
 			--TODO read offset from memory.xml
 			pos1=offsets.find(myp,0x39,ANYBYTE,0x8c,00,00,00) -- compare [reg+08c] (creature race) with any reg 
 			pos2=offsets.find(myp,0x3b,ANYBYTE,0x8c,00,00,00) -- compare  any reg with [reg+08c] (creature race)
-			pos=minEx(pos1,pos2)
+			pos=minEx{pos1,pos2}
 			if pos ~=0 then
 				
 				if(pos-p>250) then

plugins/Dfusion/luafiles/init.lua

@@ -14,6 +14,10 @@ function dofile_silent(filename) --safer dofile, with traceback, no file not fou
 	f,perr=loadfile(filename)
 	if f~=nil then
 		return xpcall(f,err)
+	else
+		if(string.sub(perr,1,11)~="cannot open") then --ugly hack
+			print(perr)	
+		end
 	end
 end
 function loadall(t1) --loads all non interactive plugin parts, so that later they could be used