Changeset 8395 in orxonox.OLD for branches/script_engine/src

Timestamp:

Jun 14, 2006, 4:26:38 PM (18 years ago)

Author:

snellen

Message:

changed order of returnvalues of the get… functions in script

Location:

branches/script_engine/src

Files:

• lib/script_engine/script.cc (modified) (4 diffs)
• lunartest2.lua (modified) (1 diff)
• world_entities/script_trigger.cc (modified) (2 diffs)

branches/script_engine/src/lib/script_engine/script.cc

@@ -244 +244 @@
    if(returnCount > 0)
    {
-     if(lua_isnumber(luaState, -1))
-     {
-       returnValue = (int)lua_tonumber(luaState, -1);
+     if(lua_isnumber(luaState, -1*returnCount))
+     {
+       returnValue = (int)lua_tonumber(luaState, -1*returnCount);
+       lua_remove(luaState,-1*returnCount);
        returnCount--;
-       lua_pop(luaState,1);
+       
      }
    }
@@ -260 +261 @@
    if(returnCount > 0)
    {
-     if(lua_isboolean(luaState, -1))
-     {
-       returnValue = (bool)lua_toboolean(luaState, -1);
+     if(lua_isboolean(luaState, -1*returnCount))
+     {
+       returnValue = (bool)lua_toboolean(luaState, -1*returnCount);
+       lua_remove(luaState,-1*returnCount);
        returnCount--;
-       lua_pop(luaState,1);
      }
    }
@@ -275 +276 @@
    if(returnCount > 0)
    {
-     if(lua_isnumber(luaState, -1))
-     {
-       returnValue = (float)lua_tonumber(luaState, -1);
+     if(lua_isnumber(luaState, -1*returnCount))
+     {
+       returnValue = (float)lua_tonumber(luaState, -1*returnCount);
+       lua_remove(luaState,-1*returnCount);
        returnCount--;
-       lua_pop(luaState,1);
      }
    }
@@ -290 +291 @@
    if(returnCount > 0)
    {
-     if(lua_isstring(luaState, -1))
-     {
-       returnValue = lua_tostring(luaState, -1);
+     if(lua_isstring(luaState, -1*returnCount))
+     {
+       returnValue = lua_tostring(luaState, -1*returnCount);
+       lua_remove(luaState,-1*returnCount);
        returnCount--;
-       lua_pop(luaState,1);
      }
    }

branches/script_engine/src/lunartest2.lua

@@ -36 +36 @@
 
   --take returnvalue from c
-  callCount = Obj:getCallCount()()
+  callCount = Obj:getCallCount()
   io.write("callCount is now ",callCount)
   io.write("\n")

branches/script_engine/src/world_entities/script_trigger.cc

@@ -160 +160 @@
    script->executeFunction();
 
-   float retf = script->getReturnedFloat();
-   printf("main returned %f\n",retf);
-
+   int ret = script->getReturnedInt();
+   printf("main returned %i\n",ret);
 
    if(script->getReturnedBool())
@@ -169 +168 @@
      printf("main returned false\n");
 
-   int ret = script->getReturnedInt();
-   printf("main returned %i\n",ret);
+   float retf = script->getReturnedFloat();
+   printf("main returned %f\n",retf);
+   
 
    printf("-------------------------- top of the stack:%i\n",lua_gettop(script->getLuaState()));