Skip to content

Backward compatibility fix for OOP_GetElementBoundingBox returning vectors post-r13998 #332

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 2 commits into from
Aug 22, 2018
Merged

Backward compatibility fix for OOP_GetElementBoundingBox returning vectors post-r13998 #332

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
94f4002
OOP_GetElementBoundingBox backward compatibility fix
Addlibs Aug 20, 2018
434fcce
Force rebuild
qaisjp Aug 22, 2018
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
12 changes: 6 additions & 6 deletions Client/mods/deathmatch/logic/luadefs/CLuaElementDefs.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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;
}
}
}
Expand Down
2 changes: 2 additions & 0 deletions Server/mods/deathmatch/logic/CResourceChecker.Data.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"},
};
Expand Down