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

Split Ride and rct2_ride

Browse Source
This commit is contained in:
Gymnasiast
2017-09-12 11:16:57 +02:00
parent 179e4dd368
commit a28509e24c
93 changed files with 1043 additions and 821 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/openrct2/interface/console.c
View File

@@ -457,7 +457,7 @@ static sint32 cc_rides(const utf8 **argv, sint32 argc)
{
if (argc > 0) {
if (strcmp(argv[0], "list") == 0) {
rct_ride *ride;
Ride *ride;
sint32 i;
FOR_ALL_RIDES(i, ride) {
char name[128];
@@ -510,7 +510,7 @@ static sint32 cc_rides(const utf8 **argv, sint32 argc)
} else if (ride_index < 0) {
console_printf("Ride index must not be negative");
} else {
rct_ride *ride = get_ride(ride_index);
Ride *ride = get_ride(ride_index);
if (mode <= 0 || mode > (RIDE_MODE_COUNT - 1)) {
console_printf("Invalid ride mode.");
}
@@ -535,7 +535,7 @@ static sint32 cc_rides(const utf8 **argv, sint32 argc)
console_printf("This command expects integer arguments");
}
else {
rct_ride *ride = get_ride(ride_index);
Ride *ride = get_ride(ride_index);
if (friction <= 0) {
console_printf("Friction value must be strictly positive");
}
@@ -566,7 +566,7 @@ static sint32 cc_rides(const utf8 **argv, sint32 argc)
console_printf("This command expects integer arguments");
}
else {
rct_ride *ride = get_ride(ride_index);
Ride *ride = get_ride(ride_index);
if (excitement <= 0) {
console_printf("Excitement value must be strictly positive");
}
@@ -590,7 +590,7 @@ static sint32 cc_rides(const utf8 **argv, sint32 argc)
console_printf("This command expects integer arguments");
}
else {
rct_ride *ride = get_ride(ride_index);
Ride *ride = get_ride(ride_index);
if (intensity <= 0) {
console_printf("Intensity value must be strictly positive");
}
@@ -614,7 +614,7 @@ static sint32 cc_rides(const utf8 **argv, sint32 argc)
console_printf("This command expects integer arguments");
}
else {
rct_ride *ride = get_ride(ride_index);
Ride *ride = get_ride(ride_index);
if (nausea <= 0) {
console_printf("Nausea value must be strictly positive");
}

2
src/openrct2/interface/viewport_interaction.c
View File

@@ -166,7 +166,7 @@ sint32 viewport_interaction_get_item_right(sint32 x, sint32 y, viewport_interact
rct_map_element *mapElement;
rct_scenery_entry *sceneryEntry;
rct_banner *banner;
rct_ride *ride;
Ride *ride;
sint32 i, stationIndex;
// No click input for title screen or track manager