mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-23 23:04:36 +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

2
src/openrct2/ride/TrackDesign.cpp
View File

@@ -1887,7 +1887,7 @@ static bool track_design_place_preview(TrackDesign* td6, money32* cost, Ride** o
ObjectEntryIndex entry_index;
if (!find_object_in_entry_group(&td6->vehicle_object, &entry_type, &entry_index))
{
entry_index = RIDE_ENTRY_INDEX_NULL;
entry_index = OBJECT_ENTRY_INDEX_NULL;
}
ride_id_t rideIndex;