Changeset 8058 in orxonox.OLD

Timestamp:

Jun 1, 2006, 1:30:30 PM (18 years ago)

Author:

snellen

Message:

added function to get a int as a return value from a lua function

Location:

branches/script_engine/src/lib/script_engine

Files:

• Script.cc (modified) (2 diffs)
• Script.h (modified) (1 diff)
• account.cc (modified) (1 diff)
• lunartest2.lua (modified) (1 diff)

branches/script_engine/src/lib/script_engine/Script.cc

@@ -74 +74 @@
  bool Script::selectFunction(std::string& functionName, int retCount)
  {
-
-   returnCount = retCount;
-   argumentCount = 0;
-   currentFunction = functionName;
-   lua_pushlstring(luaState, currentFunction.c_str(), currentFunction.size() );
+   lua_pushlstring(luaState, functionName.c_str(), functionName.size() );
    lua_gettable(luaState, LUA_GLOBALSINDEX);
 
-  /* if(lua_isfunction( luaState , -1))
+   if(lua_isfunction( luaState , -1))
    {
+     returnCount = retCount;
+     argumentCount = 0;
+     currentFunction = functionName;
      return true;
    }
    else
-   return false;*/
-   return true;
+    return false;
+
  }
 
@@ -163 +162 @@
  }
 
+ int Script::getReturnedInt()
+ {
+   if(returnCount > 0)
+   {
+     if(lua_isnumber(luaState, 1))
+     {
+       printf("int found");
+       int returnValue = (int)lua_tonumber(luaState, 1);
+       returnCount--;
+     }
+   }
+ }
+
+
  int Script::reportError(int error)
  {

branches/script_engine/src/lib/script_engine/Script.h

@@ -25 +25 @@
     bool pushParam(float param, std::string& toFunction);
     bool pushParam(double param, std::string& toFunction);
-
+    int  getReturnedInt();
 
 

branches/script_engine/src/lib/script_engine/account.cc

@@ -89 +89 @@
 
       std::string main("main");
-      script.selectFunction(main,0);
+      if( script.selectFunction(main,0))
+       printf("function %s selected\n",main.c_str());
+
       script.pushParam(3.14159,main);
       script.executeFunction();
+
+      int ret = script.getReturnedInt();
+      printf("main returned %i\n",ret);
 
       //if(argc>1) lua_dofile(script.getLuaState(), argv[1]);

branches/script_engine/src/lib/script_engine/lunartest2.lua

@@ -27 +27 @@
   a:show() a:deposit(50.30) a:show() a:withdraw(25.10) a:show()
   Obj:printName()
+
+  return 2
   --debug.debug()
 end