Changeset 1154 for code/branches/input/src/core/Script.cc

Timestamp:

Apr 24, 2008, 11:04:01 AM (17 years ago)

Author:

rgrieder

Message:

• updated input branch to trunk state. Only Input system files should differ now.
• this revision doesn't even compile, its just an 'svn save'

File:

• code/branches/input/src/core/Script.cc (modified) (3 diffs)

code/branches/input/src/core/Script.cc

@@ -60 +60 @@
     luaopen_debug(luaState_);
 #endif
-    tolua_orxonox_open(luaState_);
+    tolua_core_open(luaState_);
     output_ = "";
   }
@@ -102 +102 @@
   }
 
+#if LUA_VERSION_NUM != 501
+  const char * Script::lua_Chunkreader(lua_State *L, void *data, size_t *size)
+  {
+    LoadS* ls = ((LoadS*)data);
+    if (ls->size == 0) return NULL;
+    *size = ls->size;
+    ls->size = 0;
+    return ls->s;
+  }
+#endif
   void Script::run()
   {
@@ -110 +120 @@
     error = luaL_loadstring(luaState_, init.c_str());
 #else
-    error = lua_load(luaState_, &orxonox::Script::lua_Chunkreader, (void*)init.c_str(), "init");
+    LoadS ls;
+    ls.s = init.c_str();
+    ls.size = init.size();
+    error = lua_load(luaState_, &orxonox::Script::lua_Chunkreader, &ls, init.c_str());
 #endif
     if (error == 0)