swap ordering

Author: qaisjp

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

@@ -2303,24 +2303,38 @@ int CLuaVehicleDefs::GetVehicleRespawnRotation(lua_State* luaVM)
     return 1;
 }
 
-int CLuaVehicleDefs::GetVehicleRespawnPosition(lua_State* luaVM)
+int CLuaVehicleDefs::SetVehicleRespawnPosition(lua_State* luaVM)
 {
-    // float, float, float getVehicleRespawnPosition( vehicle theVehicle )
-    CElement* pElement = NULL;
+    CElement* pElement;
+    CVector   vecPosition;
 
     CScriptArgReader argStream(luaVM);
     argStream.ReadUserData(pElement);
+    argStream.ReadVector3D(vecPosition);
 
-    if (!argStream.HasErrors())
+    if (argStream.NextIsVector3D())
     {
-        CVector vecPosition;
-        if (CStaticFunctionDefinitions::GetVehicleRespawnPosition(pElement, vecPosition))
-        {
-            lua_pushnumber(luaVM, vecPosition.fX);
-            lua_pushnumber(luaVM, vecPosition.fY);
-            lua_pushnumber(luaVM, vecPosition.fZ);
+        CVector vecRotation;
+        argStream.ReadVector3D(vecRotation);
 
-            return 3;
+        if (!argStream.HasErrors())
+        {
+            if (CStaticFunctionDefinitions::SetVehicleRespawnPosition(pElement, vecPosition) &&
+                CStaticFunctionDefinitions::SetVehicleRespawnRotation(pElement, vecRotation))
+            {
+                lua_pushboolean(luaVM, true);
+                return 1;
+            }
+        }
+        else
+            m_pScriptDebugging->LogCustom(luaVM, argStream.GetFullErrorMessage());
+    }
+    else if (!argStream.HasErrors())
+    {
+        if (CStaticFunctionDefinitions::SetVehicleRespawnPosition(pElement, vecPosition))
+        {
+            lua_pushboolean(luaVM, true);
+            return 1;
         }
     }
     else
@@ -2330,21 +2344,24 @@ int CLuaVehicleDefs::GetVehicleRespawnPosition(lua_State* luaVM)
     return 1;
 }
 
-int CLuaVehicleDefs::SetVehicleRespawnRotation(lua_State* luaVM)
+int CLuaVehicleDefs::GetVehicleRespawnPosition(lua_State* luaVM)
 {
-    CElement* pElement;
-    CVector   vecRotation;
+    // float, float, float getVehicleRespawnPosition( vehicle theVehicle )
+    CElement* pElement = NULL;
 
     CScriptArgReader argStream(luaVM);
     argStream.ReadUserData(pElement);
-    argStream.ReadVector3D(vecRotation, CVector());
 
     if (!argStream.HasErrors())
     {
-        if (CStaticFunctionDefinitions::SetVehicleRespawnRotation(pElement, vecRotation))
+        CVector vecPosition;
+        if (CStaticFunctionDefinitions::GetVehicleRespawnPosition(pElement, vecPosition))
         {
-            lua_pushboolean(luaVM, true);
-            return 1;
+            lua_pushnumber(luaVM, vecPosition.fX);
+            lua_pushnumber(luaVM, vecPosition.fY);
+            lua_pushnumber(luaVM, vecPosition.fZ);
+
+            return 3;
         }
     }
     else
@@ -2354,35 +2371,18 @@ int CLuaVehicleDefs::SetVehicleRespawnRotation(lua_State* luaVM)
     return 1;
 }
 
-int CLuaVehicleDefs::SetVehicleRespawnPosition(lua_State* luaVM)
+int CLuaVehicleDefs::SetVehicleRespawnRotation(lua_State* luaVM)
 {
     CElement* pElement;
-    CVector   vecPosition;
+    CVector   vecRotation;
 
     CScriptArgReader argStream(luaVM);
     argStream.ReadUserData(pElement);
-    argStream.ReadVector3D(vecPosition);
-
-    if (argStream.NextIsVector3D())
-    {
-        CVector vecRotation;
-        argStream.ReadVector3D(vecRotation);
+    argStream.ReadVector3D(vecRotation, CVector());
 
-        if (!argStream.HasErrors())
-        {
-            if (CStaticFunctionDefinitions::SetVehicleRespawnPosition(pElement, vecPosition) &&
-                CStaticFunctionDefinitions::SetVehicleRespawnRotation(pElement, vecRotation))
-            {
-                lua_pushboolean(luaVM, true);
-                return 1;
-            }
-        }
-        else
-            m_pScriptDebugging->LogCustom(luaVM, argStream.GetFullErrorMessage());
-    }
-    else if (!argStream.HasErrors())
+    if (!argStream.HasErrors())
     {
-        if (CStaticFunctionDefinitions::SetVehicleRespawnPosition(pElement, vecPosition))
+        if (CStaticFunctionDefinitions::SetVehicleRespawnRotation(pElement, vecRotation))
         {
             lua_pushboolean(luaVM, true);
             return 1;