mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-16 03:23:15 +01:00
Code Issues Releases Wiki Activity

Merge pull request #16640 from ZehMatt/refactor/entityid-16469

Browse Source 
#16469: Introduce EntityId and refactor everything
This commit is contained in:
Michael Steenbeek
2022-02-18 21:29:23 +01:00
committed by GitHub
parent 8fa150a3d7 6af14a1e69
commit 4c046024a3
101 changed files with 601 additions and 458 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/openrct2/scripting/ScriptEngine.cpp
View File

@@ -894,9 +894,9 @@ DukValue ScriptEngine::GameActionResultToDuk(const GameAction& action, const Gam
if (result.Error == GameActions::Status::Ok)
{
const auto actionResult = result.GetData<StaffHireNewActionResult>();
if (actionResult.StaffEntityId != SPRITE_INDEX_NULL)
if (!actionResult.StaffEntityId.IsNull())
{
obj.Set("peep", actionResult.StaffEntityId);
obj.Set("peep", actionResult.StaffEntityId.ToUnderlying());
}
}
}