Changeset 1204

Timestamp:

03/04/2010 01:21:04 PM (6 months ago)

Author:

Paroxysm

Message:

FIXED : unit:RegisterEvent should work again. Console shouldn't spam lua errors anymore.
ADDED: Global function GetPlatform?() that returns either "windows" or "linux"

Location:

Trunk/src/LuaEngine

Files:

• GlobalFunctions.h (modified) (2 diffs)
• LUAEngine.cpp (modified) (2 diffs)
• UnitFunctions.h (modified) (1 diff)

Trunk/src/LuaEngine/GlobalFunctions.h

@@ -605 +605 @@
                 return 1;
         }
+        int GetPlatform(lua_State * L)
+        {
+#ifdef WIN32
+                lua_pushliteral(L,"windows");
+#else
+                lua_pushliteral(L,"linux");
+#endif
+                return 1;
+        }
 }
 void RegisterGlobalFunctions(lua_State *L)
@@ -646 +655 @@
         lua_register(L, "HasTimedEventWithName", &luaGlobalFunctions::HasTimedEventWithName);
         lua_register(L, "HasTimedEvent", &luaGlobalFunctions::HasTimedEvent);
+        lua_register(L,"GetPlatform",&luaGlobalFunctions::GetPlatform);
 }
 #endif

Trunk/src/LuaEngine/LUAEngine.cpp

@@ -241 +241 @@
                 lua_rawgeti(lu,LUA_REGISTRYINDEX,fReference);
                 if(!lua_isfunction(lu,-1) )
-                        luaL_error(lu,"Attempted to call an invalid function. \n");
+                        luaL_error(lu,"Attempted to call invalid function. \n");
         }
 }
@@ -247 +247 @@
 {
         bool ret = true;
-        if(lua_pcall(lu,params,res,0) )
-        {
-                report(lu);
+        int top = lua_gettop(lu);
+        if(strcmp(luaL_typename(lu,top-params),"function") )
                 ret = false;
+        else
+        {
+                if(lua_pcall(lu,params,res,0) )
+                {
+                        report(lu);
+                        ret = false;
+                }
         }
         return ret;

Trunk/src/LuaEngine/UnitFunctions.h

@@ -573 +573 @@
                 uint16 functionRef = 0;
                 lua_settop(L,1);
-                if(typeName == "function")
+                if(!strcmp(typeName,"function"))
                         functionRef = (uint16)lua_ref(L,true);
-                else if(typeName == "string")
+                else if(!strcmp(typeName,"string"))
                 {
                         const char * functionName = luaL_checkstring(L,1);