mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-02-03 18:07:53 +01:00
Code Issues Releases Wiki Activity

Identify rct_vehicle:var_D4

Browse Source
This commit is contained in:
Marijn van der Werf
2016-06-19 16:17:23 +02:00
parent 2d7526cd7e
commit 6050b1d07a
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/ride/gentle/mini_golf.c
View File

@@ -1036,7 +1036,7 @@ void vehicle_visual_mini_golf_player(int x, int imageDirection, int y, int z, rc
rct_ride_entry *rideType = get_ride_entry(get_ride(vehicle->ride)->subtype);
rct_sprite *sprite = &g_sprite_list[vehicle->peep[0]];
uint8 frame = mini_golf_peep_animation_frames[vehicle->var_D4][vehicle->var_C5];
uint8 frame = mini_golf_peep_animation_frames[vehicle->mini_golf_current_animation][vehicle->var_C5];
uint32 ebx = (frame << 2) + (imageDirection >> 3);
uint32 image_id = rideType->vehicles[0].base_image_id + 1 + ebx;
@@ -1049,7 +1049,7 @@ void vehicle_visual_mini_golf_player(int x, int imageDirection, int y, int z, rc
*/
void vehicle_visual_mini_golf_ball(int x, int imageDirection, int y, int z, rct_vehicle *vehicle, int rct2VehiclePtrFormat)
{
if (vehicle->var_D4 != 1) {
if (vehicle->mini_golf_current_animation != 1) {
return;
}

2
src/ride/ride.c
View File

@@ -4523,7 +4523,7 @@ rct_vehicle *vehicle_create_car(
if (vehicleEntry->flags_a & VEHICLE_ENTRY_FLAG_A_MINI_GOLF) {
regs.dl = 9;
vehicle->var_D3 = 0;
vehicle->var_D4 = 0;
vehicle->mini_golf_current_animation = 0;
vehicle->mini_golf_flags = 0;
}
if (vehicleEntry->flags_a & VEHICLE_ENTRY_FLAG_A_4) {

4
src/ride/vehicle.c
View File

@@ -7465,7 +7465,7 @@ loc_6DC462:
loc_6DC476:
if (vehicle->mini_golf_flags & (1 << 2)) {
uint8 nextFrame = vehicle->var_C5 + 1;
if (nextFrame < mini_golf_peep_animation_lengths[vehicle->var_D4]) {
if (nextFrame < mini_golf_peep_animation_lengths[vehicle->mini_golf_current_animation]) {
vehicle->var_C5 = nextFrame;
goto loc_6DC985;
}
@@ -7644,7 +7644,7 @@ loc_6DC743:
z = 8;
}
}
vehicle->var_D4 = (uint8)z;
vehicle->mini_golf_current_animation = (uint8)z;
vehicle->var_C5 = 0;
vehicle->track_progress++;
break;

2
src/ride/vehicle.h
View File

@@ -191,7 +191,7 @@ typedef struct rct_vehicle {
uint16 lost_time_out; // 0xD0
sint8 vertical_drop_countdown; // 0xD1
uint8 var_D3;
uint8 var_D4;
uint8 mini_golf_current_animation;
uint8 mini_golf_flags; // 0xD5
uint8 ride_subtype; // 0xD6
uint8 colours_extended; // 0xD7