mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-17 20:13:07 +01:00
Code Issues Releases Wiki Activity

refactor: changed ObjectType enum to strong enum

Browse Source 
code does not compile yet
This commit is contained in:
Łukasz Pękalski
2020-11-09 11:53:29 +01:00
parent 6e5105ab3b
commit 832fd69822
26 changed files with 209 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/openrct2/object/ObjectManager.cpp
View File

@@ -14,6 +14,7 @@
#include "../core/Console.hpp"
#include "../core/Memory.hpp"
#include "../localisation/StringIds.h"
#include "../util/Util.h"
#include "FootpathItemObject.h"
#include "LargeSceneryObject.h"
#include "Object.h"
@@ -65,7 +66,7 @@ public:
return _loadedObjects[index].get();
}
Object* GetLoadedObject(int32_t objectType, size_t index) override
Object* GetLoadedObject(ObjectType objectType, size_t index) override
{
if (index >= static_cast<size_t>(object_entry_group_counts[objectType]))
{
@@ -684,7 +685,7 @@ private:
}
// Build object lists
auto maxRideObjects = static_cast<size_t>(object_entry_group_counts[ObjectType::Ride]);
auto maxRideObjects = static_cast<size_t>(object_entry_group_counts[EnumValue(ObjectType::Ride)]);
for (size_t i = 0; i < maxRideObjects; i++)
{
auto rideObject = static_cast<RideObject*>(GetLoadedObject(ObjectType::Ride, i));