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

Merge pull request #1469 from Gymnasiast/fix-remove-all-guests

Browse Source 
Fix remove all guests cheat, improve select by track type, fixes #1462, fixes #1388
This commit is contained in:
Ted John
2015-06-25 16:12:15 +01:00
parent 2086703d23 060a00c293
commit a0f3438538
14 changed files with 65 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/ride/track.c
View File

@@ -36,6 +36,7 @@
#include "ride.h"
#include "track.h"
#include "track_data.h"
#include "../rct1.h"
/**
*
@@ -345,9 +346,8 @@ void track_list_populate(ride_list_item item, uint8* track_list_cache){
}
else{
if (find_object_in_entry_group(track_object, &entry_type, &entry_index)){
if (GET_RIDE_ENTRY(entry_index)->flags &
(RIDE_ENTRY_FLAG_SEPARATE_RIDE_NAME |
RIDE_ENTRY_FLAG_SEPARATE_RIDE))
if ((GET_RIDE_ENTRY(entry_index)->flags & (RIDE_ENTRY_FLAG_SEPARATE_RIDE_NAME | RIDE_ENTRY_FLAG_SEPARATE_RIDE)) &&
!rideTypeShouldLoseSeparateFlag(GET_RIDE_ENTRY(entry_index)))
continue;
}
else{
@@ -397,7 +397,7 @@ void track_load_list(ride_list_item item)
if (item.type < 0x80){
rct_ride_type* ride_type = gRideTypeList[item.entry_index];
if (!(ride_type->flags & RIDE_ENTRY_FLAG_SEPARATE_RIDE)){
if (!(ride_type->flags & RIDE_ENTRY_FLAG_SEPARATE_RIDE) || rideTypeShouldLoseSeparateFlag(ride_type)){
item.entry_index = 0xFF;
}
}