Changeset 8100 in orxonox.OLD

Timestamp:

Jun 1, 2006, 6:48:05 PM (18 years ago)

Author:

bensch

Message:

executor should work

Location:

branches/script_engine/src/lib

Files:

• script_engine/Makefile.am (modified) (3 diffs)
• util/executor/executor_lua.cc (modified) (1 diff)

branches/script_engine/src/lib/script_engine/Makefile.am

@@ -6 +6 @@
 noinst_LIBRARIES = libORXscript.a
 
-libORXscript_a_SOURCES =
+libORXscript_a_SOURCES = \
+                script.cc\
+                script_manager.cc
 
 AM_CPPFLAGS= @LUA_INCLUDES@
@@ -12 +14 @@
 bin_PROGRAMS = example
 example_SOURCES = \
-                example.cc\
-                script.cc\
-                script_manager.cc
+                example.cc \
+                \
+                ../util/executor/executor_lua.cc
+
 
 
@@ -23 +26 @@
 
 
+
 noinst_HEADERS = \
                 lunar.h\

branches/script_engine/src/lib/util/executor/executor_lua.cc

@@ -18 +18 @@
 #include "executor_lua.h"
 
+std::string temp;
+
 template<> bool fromLua<bool>(lua_State* state, int index) { return lua_toboolean(state, index); };
-template<> int fromLua<int>(lua_State* state, int index) { return (int)lua_toumber(state, index); };
+template<> int fromLua<int>(lua_State* state, int index) { return (int)lua_tonumber(state, index); };
 template<> unsigned int fromLua<unsigned int>(lua_State* state, int index) { return (unsigned int)lua_tonumber(state, index); };
 template<> float fromLua<float>(lua_State* state, int index) { return (float)lua_tonumber(state, index); };
-template<> char fromLua<char>(lua_State* state, int index) { reutnr (char)lua_tonumber(state, index); };
-template<> const std::string& fromLua<const std::string&>(lua_State* state, int index) { return lua_tostring(state, index); };
+template<> char fromLua<char>(lua_State* state, int index) { return (char)lua_tonumber(state, index); };
+template<> const std::string& fromLua<const std::string&>(lua_State* state, int index) { temp = lua_tostring(state, index); return temp; };