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

Fix usage of RIDE_ID_NULL

Browse Source
This commit is contained in:
Michael Steenbeek
2017-10-12 13:35:04 +02:00
parent 8c885c92a4
commit d342272dda
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/openrct2/peep/peep.c
View File

@@ -7174,7 +7174,7 @@ rct_peep *peep_generate(sint32 x, sint32 y, sint32 z)
peep->no_action_frame_no = 0;
peep->action_sprite_type = 0;
peep->peep_flags = 0;
peep->favourite_ride = 0xFF;
peep->favourite_ride = RIDE_ID_NULL;
peep->favourite_ride_rating = 0;
const rct_sprite_bounds* spriteBounds = g_peep_animation_entries[peep->sprite_type].sprite_bounds;

2
src/openrct2/rct1/S4Importer.cpp
View File

@@ -1482,7 +1482,7 @@ private:
}
else
{
dst->favourite_ride = RIDE_INDEX_NULL;
dst->favourite_ride = RIDE_ID_NULL;
dst->favourite_ride_rating = 0;
}

2
src/openrct2/ride/ride.c
View File

@@ -403,7 +403,7 @@ void ride_update_favourited_stat()
FOR_ALL_PEEPS(spriteIndex, peep) {
if (peep->linked_list_type_offset != SPRITE_LIST_PEEP * 2)
return;
if (peep->favourite_ride != 0xff) {
if (peep->favourite_ride != RIDE_ID_NULL) {
ride = &gRideList[peep->favourite_ride];
ride->guests_favourite++;
ride->window_invalidate_flags |= RIDE_INVALIDATE_RIDE_CUSTOMER;