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

Merge pull request #2950 from janisozaur/ride-names

Browse Source 
Rename ride_entry functions and provide better logging
This commit is contained in:
Ted John
2016-02-25 12:43:19 +00:00
parent 10dbcfe447 14bff0c66f
commit 74973a4a97
32 changed files with 243 additions and 211 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/interface/console.c
View File

@@ -780,7 +780,7 @@ static int cc_load_object(const utf8 **argv, int argc) {
reset_loaded_objects();
if (type == OBJECT_TYPE_RIDE) {
// Automatically research the ride so it's supported by the game.
rct_ride_type *rideEntry;
rct_ride_entry *rideEntry;
int rideType;
rideEntry = get_ride_entry(entryGroupIndex);

6
src/interface/viewport.c
View File

@@ -1080,8 +1080,8 @@ int sub_98198C(sint8 al, sint8 ah, int image_id, sint8 cl, int height, sint16 le
*/
void viewport_vehicle_paint_setup(rct_vehicle *vehicle, int imageDirection)
{
rct_ride_type *rideEntry;
const rct_ride_type_vehicle *vehicleEntry;
rct_ride_entry *rideEntry;
const rct_ride_entry_vehicle *vehicleEntry;
int x = vehicle->x;
int y = vehicle->y;
@@ -1108,7 +1108,7 @@ void viewport_vehicle_paint_setup(rct_vehicle *vehicle, int imageDirection)
}
}
uint32 rct2VehiclePtrFormat = ((uint32)vehicleEntry) - offsetof(rct_ride_type, vehicles);
uint32 rct2VehiclePtrFormat = ((uint32)vehicleEntry) - offsetof(rct_ride_entry, vehicles);
RCT2_GLOBAL(0x00F64DFC, uint32) = rct2VehiclePtrFormat;
switch (vehicleEntry->car_visual) {
case VEHICLE_VISUAL_DEFAULT: RCT2_CALLPROC_X(0x006D45F8, x, imageDirection, y, z, (int)vehicle, rct2VehiclePtrFormat, 0); break;