Skip to content

Fixes #2680 - GetGarageSize returns wrong values #4360

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Aug 15, 2025
Merged

Fixes #2680 - GetGarageSize returns wrong values #4360

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9fb608f
Fix garage size calculation by adjusting height based on garage position
MohabCodeX Aug 14, 2025
d11405e
Merge branch 'master' into fix/garage-size
MohabCodeX Aug 14, 2025
5a60a6e
compound assignment operator
MohabCodeX Aug 15, 2025
3e99a0c
Merge branch 'master' into fix/garage-size
MohabCodeX Aug 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions Client/mods/deathmatch/logic/CStaticFunctionDefinitions.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down
2 changes: 1 addition & 1 deletion Client/mods/deathmatch/logic/luadefs/CLuaWorldDefs.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
}
Expand Down