Optionally return multiple numbers instead of vectors in Vehicle.setComponentPosition/Rotation

Also applied to Element.getBoundingBox

Author: sbx320

Client/mods/deathmatch/logic/luadefs/CLuaElementDefs.cpp

@@ -1035,9 +1035,24 @@ int CLuaElementDefs::OOP_GetElementBoundingBox(lua_State* luaVM)
         CVector vecMin, vecMax;
         if (CStaticFunctionDefinitions::GetElementBoundingBox(*pEntity, vecMin, vecMax))
         {
-            lua_pushvector(luaVM, vecMin);
-            lua_pushvector(luaVM, vecMax);
-            return 2;
+            // If the caller expects six results, return six floats, otherwise two vectors
+            int iExpected = lua_ncallresult(luaVM);
+            if (iExpected == 6)
+            {
+                lua_pushnumber(luaVM, vecMin.fX);
+                lua_pushnumber(luaVM, vecMin.fY);
+                lua_pushnumber(luaVM, vecMin.fZ);
+                lua_pushnumber(luaVM, vecMax.fX);
+                lua_pushnumber(luaVM, vecMax.fY);
+                lua_pushnumber(luaVM, vecMax.fZ);
+                return 6;
+            }
+            else
+            {
+                lua_pushvector(luaVM, vecMin);
+                lua_pushvector(luaVM, vecMax);
+                return 2;
+            }
         }
     }
     else

Client/mods/deathmatch/logic/luadefs/CLuaVehicleDefs.cpp

@@ -3236,8 +3236,21 @@ int CLuaVehicleDefs::OOP_GetVehicleComponentPosition(lua_State* luaVM)
         CVector vecPosition;
         if (pVehicle->GetComponentPosition(strComponent, vecPosition, outputBase))
         {
-            lua_pushvector(luaVM, vecPosition);
-            return 1;
+            // If the caller expects three results, return 3 floats, otherwise a vector
+            int iExpected = lua_ncallresult(luaVM);
+            if (iExpected == 3)
+            {
+                lua_pushnumber(luaVM, vecPosition.fX);
+                lua_pushnumber(luaVM, vecPosition.fY);
+                lua_pushnumber(luaVM, vecPosition.fZ);
+                return 3;
+            }
+            else
+            {
+                lua_pushvector(luaVM, vecPosition);
+                return 1;
+            }
+            
         }
     }
     else
@@ -3327,8 +3340,20 @@ int CLuaVehicleDefs::OOP_GetVehicleComponentRotation(lua_State* luaVM)
         {
             // Script uses degrees
             ConvertRadiansToDegrees(vecRotation);
-            lua_pushvector(luaVM, vecRotation);
-            return 1;
+            // If the caller expects three results, return 3 floats, otherwise a vector
+            int iExpected = lua_ncallresult(luaVM);
+            if (iExpected == 3)
+            {
+                lua_pushnumber(luaVM, vecRotation.fX);
+                lua_pushnumber(luaVM, vecRotation.fY);
+                lua_pushnumber(luaVM, vecRotation.fZ);
+                return 3;
+            }
+            else
+            {
+                lua_pushvector(luaVM, vecRotation);
+                return 1;
+            }
         }
     }
     else