Merge pull request #332 from Addlibs/OOP_GetElementBoundingBox

Backward compatibility fix for OOP_GetElementBoundingBox returning vectors post-r13998
multitheftauto · Aug 22, 2018 · 2918d95 · 2918d95
2 parents 0635066 + 434fcce
commit 2918d95
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/Client/mods/deathmatch/logic/luadefs/CLuaElementDefs.cpp b/Client/mods/deathmatch/logic/luadefs/CLuaElementDefs.cpp
@@ -1015,12 +1015,6 @@ int CLuaElementDefs::OOP_GetElementBoundingBox(lua_State* luaVM)
         if (CStaticFunctionDefinitions::GetElementBoundingBox(*pEntity, vecMin, vecMax))
         {
             if (!MinClientReqCheck(argStream, MIN_CLIENT_REQ_GETBOUNDINGBOX_OOP))
-            {
-                lua_pushvector(luaVM, vecMin);
-                lua_pushvector(luaVM, vecMax);
-                return 2;
-            }
-            else
             {
                 lua_pushnumber(luaVM, vecMin.fX);
                 lua_pushnumber(luaVM, vecMin.fY);
@@ -1029,6 +1023,12 @@ int CLuaElementDefs::OOP_GetElementBoundingBox(lua_State* luaVM)
                 lua_pushnumber(luaVM, vecMax.fY);
                 lua_pushnumber(luaVM, vecMax.fZ);
                 return 6;
+            }
+            else
+            {
+                lua_pushvector(luaVM, vecMin);
+                lua_pushvector(luaVM, vecMax);
+                return 2;
             }           
         }
     }

diff --git a/Server/mods/deathmatch/logic/CResourceChecker.Data.h b/Server/mods/deathmatch/logic/CResourceChecker.Data.h
@@ -333,6 +333,8 @@ namespace
         {false, "getComponentPosition", "will return 3 floats instead of a Vector3", "1.5.5-9.11710"},
         {false, "getComponentRotation", "will return 3 floats instead of a Vector3", "1.5.5-9.11710"},
 
+        {false, "getBoundingBox", "will return 6 floats instead of 2 Vector3", "1.5.5-9.13999"},
+
         // Ped jetpacks
         {false, "doesPedHaveJetPack", "isPedWearingJetpack"},
     };