Skip to content

Fix building OOP API #3614

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 3 commits into from
Aug 28, 2024
Merged

Fix building OOP API #3614

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
be45cc1
Fix building OOP API
TheNormalnij Jul 28, 2024
2ff90bf
style fixes
TheNormalnij Aug 2, 2024
50933b4
Merge branch 'master' into TheNormalnij/fix_building_api
TheNormalnij Aug 21, 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
1 change: 1 addition & 0 deletions Client/mods/deathmatch/logic/lua/CLuaMain.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,7 @@ void CLuaMain::InitClasses(lua_State* luaVM)
CLuaVehicleDefs::AddClass(luaVM);
CLuaWaterDefs::AddClass(luaVM);
CLuaWeaponDefs::AddClass(luaVM);
CLuaBuildingDefs::AddClass(luaVM);

CLuaShared::AddClasses(luaVM);
}
Expand Down
11 changes: 7 additions & 4 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 @@ -30,10 +30,10 @@ void CLuaBuildingDefs::AddClass(lua_State* luaVM)

lua_classfunction(luaVM, "create", "createBuilding");

lua_registerclass(luaVM, "Building");
lua_registerclass(luaVM, "Building", "Element");
}

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

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

ConvertDegreesToRadians(rot);
if (rot.has_value())
ConvertDegreesToRadians(rot.value());
else
rot.emplace(CVector(0, 0, 0));

m_pBuildingManager->ResizePoolIfNeeds();

CClientBuilding* pBuilding = new CClientBuilding(m_pManager, INVALID_ELEMENT_ID, modelId, pos, rot, interior.value_or(0));
CClientBuilding* pBuilding = new CClientBuilding(m_pManager, INVALID_ELEMENT_ID, modelId, pos, rot.value() , 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, uint16_t modelId, CVector pos, CVector rot, std::optional<uint8_t> interior);
static CClientBuilding* CreateBuilding(lua_State* const luaVM, std::uint16_t modelId, CVector pos, std::optional<CVector> rot, std::optional<std::uint8_t> interior);
static void RemoveAllGameBuildings();
static void RestoreGameBuildings();
};