Skip to content

Fix #3738 createBuilding optional arguments not handled correctly #3778

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

Closed
wants to merge 2 commits into from
Closed

Fix #3738 createBuilding optional arguments not handled correctly #3778

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
a927230
Fix bug
FileEX Oct 8, 2024
ca0a451
Review
FileEX Oct 8, 2024
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/CLuaBuildingDefs.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ void CLuaBuildingDefs::AddClass(lua_State* luaVM)
lua_registerclass(luaVM, "Building", "Element");
}

CClientBuilding* CLuaBuildingDefs::CreateBuilding(lua_State* const luaVM, std::uint16_t modelId, CVector pos, std::optional<CVector> rot, std::optional<std::uint8_t> interior)
CClientBuilding* CLuaBuildingDefs::CreateBuilding(lua_State* const luaVM, std::uint16_t modelId, CVector pos, std::optional<float> rotX, std::optional<float> rotY, std::optional<float> rotZ, std::optional<std::uint8_t> interior)
{
CLuaMain* pLuaMain = m_pLuaManager->GetVirtualMachine(luaVM);

Expand All @@ -48,14 +48,14 @@ CClientBuilding* CLuaBuildingDefs::CreateBuilding(lua_State* const luaVM, std::u
if (!CClientBuildingManager::IsValidPosition(pos))
throw std::invalid_argument("Position is outside of game world");

if (rot.has_value())
ConvertDegreesToRadians(rot.value());
else
rot.emplace(CVector(0, 0, 0));
CVector rot{rotX.value_or(0), rotY.value_or(0), rotZ.value_or(0)};
float epsilon = std::numeric_limits<float>::epsilon();
if (std::abs(rot.fX) < epsilon || std::abs(rot.fY) < epsilon || std::abs(rot.fZ) < epsilon)
ConvertDegreesToRadians(rot);

m_pBuildingManager->ResizePoolIfNeeds();

CClientBuilding* pBuilding = new CClientBuilding(m_pManager, INVALID_ELEMENT_ID, modelId, pos, rot.value() , interior.value_or(0));
CClientBuilding* pBuilding = new CClientBuilding(m_pManager, INVALID_ELEMENT_ID, modelId, pos, rot, interior.value_or(0));

CClientEntity* pRoot = pResource->GetResourceDynamicEntity();
pBuilding->SetParent(pRoot);
Expand Down
2 changes: 1 addition & 1 deletion Client/mods/deathmatch/logic/luadefs/CLuaBuildingDefs.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ class CLuaBuildingDefs : public CLuaDefs
static void AddClass(lua_State* luaVM);

// Buiding create funcs
static CClientBuilding* CreateBuilding(lua_State* const luaVM, std::uint16_t modelId, CVector pos, std::optional<CVector> rot, std::optional<std::uint8_t> interior);
static CClientBuilding* CreateBuilding(lua_State* const luaVM, std::uint16_t modelId, CVector pos, std::optional<float> rotX, std::optional<float> rotY, std::optional<float> rotZ, std::optional<std::uint8_t> interior);
static void RemoveAllGameBuildings();
static void RestoreGameBuildings();
};
Loading