revert dostring,fix main.txt error

pangweiwei · Jul 1, 2015 · fb3ac69 · fb3ac69
1 parent 0007313
commit fb3ac69
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 8 deletions.
diff --git a/Assets/Slua/Resources/main.txt b/Assets/Slua/Resources/main.txt
@@ -25,11 +25,6 @@ function main()
 		print("using lua")
 	end
 
-	HelloWorld.depth= "a"
-	print(HelloWorld.depth)
-	HelloWorld.priority=1
-	print(HelloWorld.priority)
-
 	-- test custom component
 	local x=UnityEngine.GameObject("OoOo")
 	x:AddComponent(SLuaTest)

diff --git a/Assets/Slua/Script/LuaState.cs b/Assets/Slua/Script/LuaState.cs
@@ -522,10 +522,10 @@ static int init(IntPtr L)
 	return unpack(ret)
 end
 ";
-            // overload resume function for report error
-            if (LuaDLL.lua_dostring(L, resumefunc) != 0)
-                LuaObject.lastError(L);
 
+			// overload resume function for report error
+			LuaState.get(L).doString(resumefunc);
+
             LuaDLL.lua_pushcfunction(L, dofile);
             LuaDLL.lua_setglobal(L, "dofile");
 
@@ -708,6 +708,17 @@ internal static int dofile(IntPtr L)
 			}
 			return 0;
 		}
+
+		public object doString(string str)
+		{
+			byte[] bytes = Encoding.UTF8.GetBytes(str);
+
+			object obj;
+			if (doBuffer(bytes, "temp buffer", out obj))
+				return obj;
+			return null; ;
+
+		}
 
 		[MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
 		internal static int loader(IntPtr L)