Synchronize changes from 1.6 master branch [ci skip]

274d865 Fixes #2680 - GetGarageSize returns wrong values (#4360)

Author: github-actions[bot]

Client/mods/deathmatch/logic/CStaticFunctionDefinitions.cpp

@@ -6676,6 +6676,11 @@ bool CStaticFunctionDefinitions::GetGarageSize(unsigned char ucGarageID, float&
     if (pGarage)
     {
         pGarage->GetSize(fHeight, fWidth, fDepth);
+        
+        CVector vecPosition;
+        pGarage->GetPosition(vecPosition);
+        fHeight -= vecPosition.fZ;
+        
         return true;
     }
 

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

@@ -678,9 +678,9 @@ int CLuaWorldDefs::GetGarageSize(lua_State* luaVM)
 
         if (CStaticFunctionDefinitions::GetGarageSize(iGarageID, fHeight, fWidth, fDepth))
         {
-            lua_pushnumber(luaVM, fHeight);
             lua_pushnumber(luaVM, fWidth);
             lua_pushnumber(luaVM, fDepth);
+            lua_pushnumber(luaVM, fHeight);
             return 3;
         }
     }