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

Merge pull request #1628 from Gymnasiast/ride-naming

Browse Source 
Use correct ride naming in select-by-track-type mode
This commit is contained in:
Duncan
2015-07-16 12:23:48 +01:00
parent 7cddad5026 97fa80d044
commit ff3313a403
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/ride/ride.c
View File

@@ -34,6 +34,7 @@
#include "../management/news_item.h"
#include "../peep/peep.h"
#include "../peep/staff.h"
#include "../rct1.h"
#include "../scenario.h"
#include "../util/util.h"
#include "../windows/error.h"
@@ -4854,7 +4855,7 @@ money32 ride_create(int type, int subType, int flags, int *outRideIndex)
uint8 *availableRideEntries = get_ride_entry_indices_for_ride_type(type);
for (uint8 *rei = availableRideEntries; *rei != 255; rei++) {
rideEntry = GET_RIDE_ENTRY(*rei);
if (rideEntry->flags & RIDE_ENTRY_FLAG_SEPARATE_RIDE_NAME) {
if ((rideEntry->flags & RIDE_ENTRY_FLAG_SEPARATE_RIDE_NAME) && !rideTypeShouldLoseSeparateFlag(rideEntry)) {
subType = *rei;
goto foundRideEntry;
}
@@ -4903,7 +4904,7 @@ foundRideEntry:
ride->name_arguments_type_name = name_args.type_name;
ride->name_arguments_number = name_args.number;
} else {
if (!(rideEntry->flags & RIDE_ENTRY_FLAG_SEPARATE_RIDE_NAME)) {
if (!(rideEntry->flags & RIDE_ENTRY_FLAG_SEPARATE_RIDE_NAME) || rideTypeShouldLoseSeparateFlag(rideEntry)) {
goto useDefaultName;
}
ride->name = 1;