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

refactor: ObjectType to use strong enum

Browse Source 
enum renaming complete
This commit is contained in:
Łukasz Pękalski
2020-11-09 10:36:37 +01:00
parent 1ab3f4b250
commit 6e5105ab3b
40 changed files with 255 additions and 255 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
src/openrct2/EditorObjectSelectionSession.cpp
View File

@@ -30,8 +30,8 @@
bool _maxObjectsWasHit;
std::vector<uint8_t> _objectSelectionFlags;
int32_t _numSelectedObjectsForType[OBJECT_TYPE_COUNT];
static int32_t _numAvailableObjectsForType[OBJECT_TYPE_COUNT];
int32_t _numSelectedObjectsForType[ObjectType::Count];
static int32_t _numAvailableObjectsForType[ObjectType::Count];
static void setup_in_use_selection_flags();
static void setup_track_designer_objects();
@@ -51,7 +51,7 @@ static void setup_track_manager_objects()
uint8_t* selectionFlags = &_objectSelectionFlags[i];
const ObjectRepositoryItem* item = &items[i];
uint8_t object_type = item->ObjectEntry.GetType();
if (object_type == OBJECT_TYPE_RIDE)
if (object_type == ObjectType::Ride)
{
*selectionFlags |= OBJECT_SELECTION_FLAG_6;
@@ -80,7 +80,7 @@ static void setup_track_designer_objects()
uint8_t* selectionFlags = &_objectSelectionFlags[i];
const ObjectRepositoryItem* item = &items[i];
uint8_t objectType = item->ObjectEntry.GetType();
if (objectType == OBJECT_TYPE_RIDE)
if (objectType == ObjectType::Ride)
{
*selectionFlags |= OBJECT_SELECTION_FLAG_6;
@@ -107,7 +107,7 @@ void setup_in_use_selection_flags()
{
auto& objectMgr = OpenRCT2::GetContext()->GetObjectManager();
for (uint8_t objectType = 0; objectType < OBJECT_TYPE_COUNT; objectType++)
for (uint8_t objectType = 0; objectType < ObjectType::Count; objectType++)
{
for (int32_t i = 0; i < object_entry_group_counts[objectType]; i++)
{
@@ -135,19 +135,19 @@ void setup_in_use_selection_flags()
break;
case TILE_ELEMENT_TYPE_PATH:
type = iter.element->AsPath()->GetSurfaceEntryIndex();
assert(type < object_entry_group_counts[OBJECT_TYPE_PATHS]);
Editor::SetSelectedObject(OBJECT_TYPE_PATHS, type, OBJECT_SELECTION_FLAG_SELECTED);
assert(type < object_entry_group_counts[ObjectType::Paths]);
Editor::SetSelectedObject(ObjectType::Paths, type, OBJECT_SELECTION_FLAG_SELECTED);
if (iter.element->AsPath()->HasAddition())
{
uint8_t path_additions = iter.element->AsPath()->GetAdditionEntryIndex();
Editor::SetSelectedObject(OBJECT_TYPE_PATH_BITS, path_additions, OBJECT_SELECTION_FLAG_SELECTED);
Editor::SetSelectedObject(ObjectType::PathBits, path_additions, OBJECT_SELECTION_FLAG_SELECTED);
}
break;
case TILE_ELEMENT_TYPE_SMALL_SCENERY:
type = iter.element->AsSmallScenery()->GetEntryIndex();
assert(type < object_entry_group_counts[OBJECT_TYPE_SMALL_SCENERY]);
Editor::SetSelectedObject(OBJECT_TYPE_SMALL_SCENERY, type, OBJECT_SELECTION_FLAG_SELECTED);
assert(type < object_entry_group_counts[ObjectType::SmallScenery]);
Editor::SetSelectedObject(ObjectType::SmallScenery, type, OBJECT_SELECTION_FLAG_SELECTED);
break;
case TILE_ELEMENT_TYPE_ENTRANCE:
if (iter.element->AsEntrance()->GetEntranceType() != ENTRANCE_TYPE_PARK_ENTRANCE)
@@ -156,21 +156,21 @@ void setup_in_use_selection_flags()
if (iter.element->AsEntrance()->GetSequenceIndex() != 0)
break;
Editor::SetSelectedObject(OBJECT_TYPE_PARK_ENTRANCE, 0, OBJECT_SELECTION_FLAG_SELECTED);
Editor::SetSelectedObject(ObjectType::ParkEntrance, 0, OBJECT_SELECTION_FLAG_SELECTED);
type = iter.element->AsEntrance()->GetPathType();
assert(type < object_entry_group_counts[OBJECT_TYPE_PATHS]);
Editor::SetSelectedObject(OBJECT_TYPE_PATHS, type, OBJECT_SELECTION_FLAG_SELECTED);
assert(type < object_entry_group_counts[ObjectType::Paths]);
Editor::SetSelectedObject(ObjectType::Paths, type, OBJECT_SELECTION_FLAG_SELECTED);
break;
case TILE_ELEMENT_TYPE_WALL:
type = iter.element->AsWall()->GetEntryIndex();
assert(type < object_entry_group_counts[OBJECT_TYPE_WALLS]);
Editor::SetSelectedObject(OBJECT_TYPE_WALLS, type, OBJECT_SELECTION_FLAG_SELECTED);
assert(type < object_entry_group_counts[ObjectType::Walls]);
Editor::SetSelectedObject(ObjectType::Walls, type, OBJECT_SELECTION_FLAG_SELECTED);
break;
case TILE_ELEMENT_TYPE_LARGE_SCENERY:
type = iter.element->AsLargeScenery()->GetEntryIndex();
assert(type < object_entry_group_counts[OBJECT_TYPE_LARGE_SCENERY]);
Editor::SetSelectedObject(OBJECT_TYPE_LARGE_SCENERY, type, OBJECT_SELECTION_FLAG_SELECTED);
assert(type < object_entry_group_counts[ObjectType::LargeScenery]);
Editor::SetSelectedObject(ObjectType::LargeScenery, type, OBJECT_SELECTION_FLAG_SELECTED);
break;
case TILE_ELEMENT_TYPE_BANNER:
{
@@ -178,8 +178,8 @@ void setup_in_use_selection_flags()
if (banner != nullptr)
{
type = banner->type;
assert(type < object_entry_group_counts[OBJECT_TYPE_BANNERS]);
Editor::SetSelectedObject(OBJECT_TYPE_BANNERS, type, OBJECT_SELECTION_FLAG_SELECTED);
assert(type < object_entry_group_counts[ObjectType::Banners]);
Editor::SetSelectedObject(ObjectType::Banners, type, OBJECT_SELECTION_FLAG_SELECTED);
}
break;
}
@@ -192,7 +192,7 @@ void setup_in_use_selection_flags()
if (ride != nullptr)
{
ObjectEntryIndex type = ride->subtype;
Editor::SetSelectedObject(OBJECT_TYPE_RIDE, type, OBJECT_SELECTION_FLAG_SELECTED);
Editor::SetSelectedObject(ObjectType::Ride, type, OBJECT_SELECTION_FLAG_SELECTED);
}
}
@@ -230,7 +230,7 @@ void sub_6AB211()
int32_t numObjects = static_cast<int32_t>(object_repository_get_items_count());
_objectSelectionFlags = std::vector<uint8_t>(numObjects);
for (uint8_t objectType = 0; objectType < OBJECT_TYPE_COUNT; objectType++)
for (uint8_t objectType = 0; objectType < ObjectType::Count; objectType++)
{
_numSelectedObjectsForType[objectType] = 0;
_numAvailableObjectsForType[objectType] = 0;
@@ -289,7 +289,7 @@ static void remove_selected_objects_from_research(const rct_object_entry* instal
if (!find_object_in_entry_group(installedObject, &entry_type, &entry_index))
return;
if (entry_type == OBJECT_TYPE_RIDE)
if (entry_type == ObjectType::Ride)
{
auto rideEntry = get_ride_entry(entry_index);
@@ -302,7 +302,7 @@ static void remove_selected_objects_from_research(const rct_object_entry* instal
research_remove(&tmp);
}
}
else if (entry_type == OBJECT_TYPE_SCENERY_GROUP)
else if (entry_type == ObjectType::SceneryGroup)
{
ResearchItem tmp = {};
tmp.type = Research::EntryType::Scenery;
@@ -451,7 +451,7 @@ bool window_editor_object_selection_select_object(uint8_t isMasterObject, int32_
}
uint8_t objectType = item->ObjectEntry.GetType();
if (objectType == OBJECT_TYPE_SCENERY_GROUP && (flags & INPUT_FLAG_EDITOR_OBJECT_SELECT_OBJECTS_IN_SCENERY_GROUP))
if (objectType == ObjectType::SceneryGroup && (flags & INPUT_FLAG_EDITOR_OBJECT_SELECT_OBJECTS_IN_SCENERY_GROUP))
{
for (const auto& sgEntry : item->SceneryGroupInfo.Entries)
{
@@ -490,7 +490,7 @@ bool window_editor_object_selection_select_object(uint8_t isMasterObject, int32_
return false;
}
if (objectType == OBJECT_TYPE_SCENERY_GROUP && (flags & INPUT_FLAG_EDITOR_OBJECT_SELECT_OBJECTS_IN_SCENERY_GROUP))
if (objectType == ObjectType::SceneryGroup && (flags & INPUT_FLAG_EDITOR_OBJECT_SELECT_OBJECTS_IN_SCENERY_GROUP))
{
for (const auto& sgEntry : item->SceneryGroupInfo.Entries)
{
@@ -572,7 +572,7 @@ int32_t editor_remove_unused_objects()
const ObjectRepositoryItem* item = &items[i];
uint8_t objectType = item->ObjectEntry.GetType();
if (objectType >= OBJECT_TYPE_SCENERY_GROUP)
if (objectType >= ObjectType::SceneryGroup)
{
continue;
}