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

Use 16-bit ride_id_t thoughout and raise RIDE_ID_NULL (#14411)

Browse Source 
* Replace RIDE_ENTRY_INDEX_NULL with OBJECT_ENTRY_INDEX_NULL

Ride entries are objects like any other, so there is little point having separate constants.

* Use ride_id_t in many more places

* Change RIDE_ID_NULL to 0xFFFF

* Increment network version

* Update replays

Co-authored-by: duncanspumpkin <duncans_pumpkin@hotmail.co.uk>
This commit is contained in:
Michael Steenbeek
2021-04-01 17:02:57 +02:00
committed by GitHub
parent cbefc4fe38
commit 7344b7fbfd
32 changed files with 80 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/openrct2/EditorObjectSelectionSession.cpp
View File

@@ -206,7 +206,7 @@ void setup_in_use_selection_flags()
for (auto* vehicle : TrainManager::View())
{
ObjectEntryIndex type = vehicle->ride_subtype;
if (type != RIDE_ENTRY_INDEX_NULL) // cable lifts use index null. Ignore them
if (type != OBJECT_ENTRY_INDEX_NULL) // cable lifts use index null. Ignore them
{
Editor::SetSelectedObject(ObjectType::Ride, type, OBJECT_SELECTION_FLAG_SELECTED);
}
@@ -214,7 +214,7 @@ void setup_in_use_selection_flags()
for (auto vehicle : EntityList<Vehicle>())
{
ObjectEntryIndex type = vehicle->ride_subtype;
if (type != RIDE_ENTRY_INDEX_NULL) // cable lifts use index null. Ignore them
if (type != OBJECT_ENTRY_INDEX_NULL) // cable lifts use index null. Ignore them
{
Editor::SetSelectedObject(ObjectType::Ride, type, OBJECT_SELECTION_FLAG_SELECTED);
}