mirror of https://github.com/OpenRCT2/OpenRCT2.git
Extract ride data array, use memset for zeroing array
This commit is contained in:
parent
bb01732f74
commit
cf67177a08
|
@ -5427,17 +5427,7 @@ foundRideEntry:
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
ride->num_customers[0] = 0;
|
memset(ride->num_customers, 0, 10 * sizeof(ride->num_customers));
|
||||||
ride->num_customers[1] = 0;
|
|
||||||
ride->num_customers[2] = 0;
|
|
||||||
ride->num_customers[3] = 0;
|
|
||||||
ride->num_customers[4] = 0;
|
|
||||||
ride->num_customers[5] = 0;
|
|
||||||
ride->num_customers[6] = 0;
|
|
||||||
ride->num_customers[7] = 0;
|
|
||||||
ride->num_customers[8] = 0;
|
|
||||||
ride->num_customers[9] = 0;
|
|
||||||
|
|
||||||
ride->value = 0xFFFF;
|
ride->value = 0xFFFF;
|
||||||
ride->satisfaction = 255;
|
ride->satisfaction = 255;
|
||||||
ride->satisfaction_time_out = 0;
|
ride->satisfaction_time_out = 0;
|
||||||
|
|
|
@ -585,6 +585,100 @@ const uint8 rideUnknownData3[0x60] = {
|
||||||
10, // 59 LIM Launched Roller Coaster
|
10, // 59 LIM Launched Roller Coaster
|
||||||
};
|
};
|
||||||
|
|
||||||
|
// Data at 0x0097D21E
|
||||||
|
const uint8 rideBonusValue[0x60] = {
|
||||||
|
85, // 00 Spiral Roller coaster
|
||||||
|
90, // 01 Stand Up Coaster
|
||||||
|
90, // 02 Suspended Swinging
|
||||||
|
100, // 03 Inverted
|
||||||
|
60, // 04 Steel Mini Coaster
|
||||||
|
50, // 05 Mini Railroad
|
||||||
|
60, // 06 Monorail
|
||||||
|
50, // 07 Mini Suspended Coaster
|
||||||
|
40, // 08 Boat Ride
|
||||||
|
55, // 09 Wooden Wild Mine/Mouse
|
||||||
|
60, // 0a Steeplechase/Motorbike/Soap
|
||||||
|
50, // 0b Car Ride
|
||||||
|
65, // 0c Launched Freefall
|
||||||
|
75, // 0d Bobsleigh Coaster
|
||||||
|
45, // 0e Observation Tower
|
||||||
|
95, // 0f Looping Roller Coaster
|
||||||
|
55, // 10 Dinghy Slide
|
||||||
|
85, // 11 Mine Train Coaster
|
||||||
|
55, // 12 Chairlift
|
||||||
|
100, // 13 Corkscrew Roller Coaster
|
||||||
|
40, // 14 Maze
|
||||||
|
40, // 15 Spiral Slide
|
||||||
|
55, // 16 Go Karts
|
||||||
|
65, // 17 Log Flume
|
||||||
|
70, // 18 River Rapids
|
||||||
|
35, // 19 Bumper Cars
|
||||||
|
35, // 1a Pirate Ship
|
||||||
|
35, // 1b Swinging Inverter Ship
|
||||||
|
15, // 1c Food Stall
|
||||||
|
15, // 1d (none)
|
||||||
|
15, // 1e Drink Stall
|
||||||
|
15, // 1f (none)
|
||||||
|
15, // 20 Shop (all types)
|
||||||
|
45, // 21 Merry Go Round
|
||||||
|
15, // 22 Balloon Stall (maybe)
|
||||||
|
15, // 23 Information Kiosk
|
||||||
|
5, // 24 Bathroom
|
||||||
|
45, // 25 Ferris Wheel
|
||||||
|
45, // 26 Motion Simulator
|
||||||
|
45, // 27 3D Cinema
|
||||||
|
55, // 28 Topspin
|
||||||
|
30, // 29 Space Rings
|
||||||
|
70, // 2a Reverse Freefall Coaster
|
||||||
|
45, // 2b Elevator
|
||||||
|
95, // 2c Vertical Drop Roller Coaster
|
||||||
|
5, // 2d ATM
|
||||||
|
40, // 2e Twist
|
||||||
|
22, // 2f Haunted House
|
||||||
|
5, // 30 First Aid
|
||||||
|
39, // 31 Circus Show
|
||||||
|
50, // 32 Ghost Train
|
||||||
|
120, // 33 Twister Roller Coaster
|
||||||
|
105, // 34 Wooden Roller Coaster
|
||||||
|
65, // 35 Side-Friction Roller Coaster
|
||||||
|
55, // 36 Wild Mouse
|
||||||
|
100, // 37 Multi Dimension Coaster
|
||||||
|
100, // 38 (none)
|
||||||
|
100, // 39 Flying Roller Coaster
|
||||||
|
100, // 3a (none)
|
||||||
|
50, // 3b Virginia Reel
|
||||||
|
65, // 3c Splash Boats
|
||||||
|
45, // 3d Mini Helicopters
|
||||||
|
100, // 3e Lay-down Roller Coaster
|
||||||
|
60, // 3f Suspended Monorail
|
||||||
|
100, // 40 (none)
|
||||||
|
65, // 41 Reverser Roller Coaster
|
||||||
|
35, // 42 Heartline Twister Roller Coaster
|
||||||
|
23, // 43 Mini Golf
|
||||||
|
120, // 44 Giga Coaster
|
||||||
|
45, // 45 Roto-Drop
|
||||||
|
35, // 46 Flying Saucers
|
||||||
|
22, // 47 Crooked House
|
||||||
|
45, // 48 Monorail Cycles
|
||||||
|
80, // 49 Compact Inverted Coaster
|
||||||
|
60, // 4a Water Coaster
|
||||||
|
70, // 4b Air Powered Vertical Coaster
|
||||||
|
55, // 4c Inverted Hairpin Coaster
|
||||||
|
35, // 4d Magic Carpet
|
||||||
|
40, // 4e Submarine Ride
|
||||||
|
65, // 4f River Rafts
|
||||||
|
15, // 50 (none)
|
||||||
|
45, // 51 Enterprise
|
||||||
|
15, // 52 (none)
|
||||||
|
15, // 53 (none)
|
||||||
|
15, // 54 (none)
|
||||||
|
100, // 55 (none)
|
||||||
|
75, // 56 Inverted Impulse Coaster
|
||||||
|
60, // 57 Mini Roller Coaster
|
||||||
|
70, // 58 Mine Ride
|
||||||
|
55, // 59 LIM Launched Roller Coaster
|
||||||
|
};
|
||||||
|
|
||||||
const rct_ride_name_convention RideNameConvention[96] = {
|
const rct_ride_name_convention RideNameConvention[96] = {
|
||||||
{ 1229, 1243, 1257, 0 }, // 00 Spiral Roller coaster
|
{ 1229, 1243, 1257, 0 }, // 00 Spiral Roller coaster
|
||||||
{ 1229, 1243, 1257, 0 }, // 01 Stand Up Coaster
|
{ 1229, 1243, 1257, 0 }, // 01 Stand Up Coaster
|
||||||
|
|
|
@ -80,6 +80,7 @@ extern const uint8 costPerTrackPiece[0x60];
|
||||||
extern const uint8 rideUnknownData1[0x60];
|
extern const uint8 rideUnknownData1[0x60];
|
||||||
extern const bool rideUnknownData2[0x60];
|
extern const bool rideUnknownData2[0x60];
|
||||||
extern const uint8 rideUnknownData3[0x60];
|
extern const uint8 rideUnknownData3[0x60];
|
||||||
|
extern const uint8 rideBonusValue[0x60];
|
||||||
|
|
||||||
extern const rct_ride_name_convention RideNameConvention[96];
|
extern const rct_ride_name_convention RideNameConvention[96];
|
||||||
extern const uint8 RideAvailableModes[];
|
extern const uint8 RideAvailableModes[];
|
||||||
|
|
|
@ -30,6 +30,7 @@
|
||||||
#include "../management/research.h"
|
#include "../management/research.h"
|
||||||
#include "../peep/peep.h"
|
#include "../peep/peep.h"
|
||||||
#include "../ride/ride.h"
|
#include "../ride/ride.h"
|
||||||
|
#include "../ride/ride_data.h"
|
||||||
#include "../scenario.h"
|
#include "../scenario.h"
|
||||||
#include "../world/map.h"
|
#include "../world/map.h"
|
||||||
#include "park.h"
|
#include "park.h"
|
||||||
|
@ -285,7 +286,7 @@ money32 calculate_ride_value(rct_ride *ride)
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
// Fair value * (...)
|
// Fair value * (...)
|
||||||
return (ride->value * 10) * (ride_customers_in_last_5_minutes(ride) + *((uint8*)(0x0097D21E + (ride->type * 8))) * 4);
|
return (ride->value * 10) * (ride_customers_in_last_5_minutes(ride) + rideBonusValue[ride->type] * 4);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -366,7 +367,7 @@ static int park_calculate_guest_generation_probability()
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
// Add guest score for ride type
|
// Add guest score for ride type
|
||||||
suggestedMaxGuests += RCT2_GLOBAL(0x0097D21E + (ride->type * 8), uint8);
|
suggestedMaxGuests += rideBonusValue[ride->type];
|
||||||
|
|
||||||
// Add ride value
|
// Add ride value
|
||||||
if (ride->value != RIDE_VALUE_UNDEFINED) {
|
if (ride->value != RIDE_VALUE_UNDEFINED) {
|
||||||
|
@ -397,7 +398,7 @@ static int park_calculate_guest_generation_probability()
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
// Bonus guests for good ride
|
// Bonus guests for good ride
|
||||||
suggestedMaxGuests += RCT2_GLOBAL(0x0097D21E + (ride->type * 8), uint8) * 2;
|
suggestedMaxGuests += rideBonusValue[ride->type] * 2;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue