Changeset 8066 in orxonox.OLD

Timestamp:

Jun 1, 2006, 2:06:34 PM (18 years ago)

Author:

snellen

Message:

return values form a lua works now

Location:

branches/script_engine/src/lib/script_engine

Files:

• Script.cc (modified) (4 diffs)
• Script.h (modified) (1 diff)

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

@@ -74 +74 @@
  bool Script::selectFunction(std::string& functionName, int retCount)
  {
+   if(returnCount == 0) //no return values left on the stack
+   {
    lua_pushlstring(luaState, functionName.c_str(), functionName.size() );
    lua_gettable(luaState, LUA_GLOBALSINDEX);
@@ -86 +88 @@
    else
     return false;
-
+   }
+   else
+     printf("there are unremoved return values on the stack. Please remove them first.\n");
  }
 
@@ -103 +107 @@
     {
       currentFunction.assign("");//a function gets unusable after beeing called for the first time
-      returnCount = argumentCount = 0;
+      argumentCount = 0;
       return true;
     }
@@ -164 +168 @@
  int Script::getReturnedInt()
  {
+   int returnValue;
    if(returnCount > 0)
    {
-     printf("int found");
-     if(lua_isnumber(luaState, 1))
-     {
-       printf("int found");
-       int returnValue = (int)lua_tonumber(luaState, 1);
+     if(lua_isnumber(luaState, -1))
+     {
+       returnValue = (int)lua_tonumber(luaState, -1);
        returnCount--;
      }
    }
+   return returnValue;
+ }
+
+
+ bool Script::getReturnedBool()
+ {
+   bool returnValue;
+   if(returnCount > 0)
+   {
+     if(lua_isboolean(luaState, -1))
+     {
+       returnValue = (bool)lua_toboolean(luaState, -1);
+       returnCount--;
+     }
+   }
+   return returnValue;
  }
 

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

@@ -22 +22 @@
     bool selectFunction(std::string& functionName, int retCount);
     bool executeFunction();
+    // push parameters for luafunction
     bool pushParam(int param, std::string& toFunction);//overload this function to add different types
     bool pushParam(float param, std::string& toFunction);
     bool pushParam(double param, std::string& toFunction);
-    int  getReturnedInt();
-
+    // get returned values
+    int  getReturnedInt();//overload this function to get different types
+    bool getReturnedBool();