mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #3888 from marijnvdwerf/integrate/mini-golf 

Integrate mini golf data.
This commit is contained in:
Ted John 2016-07-26 19:24:08 +01:00 committed by GitHub
parent 82d52b63e6 215ed5e14d
commit f5f4238c0b
4 changed files with 65 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -372,6 +372,58 @@ static const uint32 mini_golf_track_sprites_hole_e[][3][2] = {
},
};
/** rct2: 0x00933471 */
static const uint8 mini_golf_peep_animation_frames_walk[] = {0, 1, 2, 3, 4, 5};
/** rct2: 0x00933478 */
static const uint8 mini_golf_peep_animation_frames_place_ball_downwards[] = {12, 13, 14, 15};
/** rct2: 0x009334B5 */
static const uint8 mini_golf_peep_animation_frames_swing[] = {31, 31, 31, 31, 31, 31, 31, 31, 31, 32, 33, 33, 33, 33, 34};
/** rct2: 0x0093347D */
static const uint8 mini_golf_peep_animation_frames_swing_left[] = {6, 6, 6, 6, 6, 6, 6, 6, 6, 7, 8, 8, 8, 8, 9};
/** rct2: 0x0093348D */
static const uint8 mini_golf_peep_animation_frames_place_ball_upwards[] = {12, 13, 14, 15, 14, 13, 12};
/** rct2: 0x00933495 */
static const uint8 mini_golf_peep_animation_frames_jump[] = {16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30};
/** rct2: 0x009334A5 */
static const uint8 mini_golf_peep_animation_frames_pickup_ball[] = {15, 14, 13, 12};
/** rct2: 0x009334C5 */
static const uint8 mini_golf_peep_animation_frames_put[] = {35, 36, 36, 36, 36, 36, 35, 35, 35, 35};
/** rct2: 0x009334AA */
static const uint8 mini_golf_peep_animation_frames_put_left[] = {10, 11, 11, 11, 11, 11, 10, 10, 10, 10};
/** rct2: 0x008B8F74 */
static const uint8 * mini_golf_peep_animation_frames[] = {
mini_golf_peep_animation_frames_walk,
mini_golf_peep_animation_frames_place_ball_downwards,
mini_golf_peep_animation_frames_swing_left,
mini_golf_peep_animation_frames_place_ball_upwards,
mini_golf_peep_animation_frames_jump,
mini_golf_peep_animation_frames_pickup_ball,
mini_golf_peep_animation_frames_put_left,
mini_golf_peep_animation_frames_swing,
mini_golf_peep_animation_frames_put,
};
const uint8 mini_golf_peep_animation_lengths[] = {
countof(mini_golf_peep_animation_frames_walk),
countof(mini_golf_peep_animation_frames_place_ball_downwards),
countof(mini_golf_peep_animation_frames_swing_left),
countof(mini_golf_peep_animation_frames_place_ball_upwards),
countof(mini_golf_peep_animation_frames_jump),
countof(mini_golf_peep_animation_frames_pickup_ball),
countof(mini_golf_peep_animation_frames_put_left),
countof(mini_golf_peep_animation_frames_swing),
countof(mini_golf_peep_animation_frames_put),
};
static paint_struct * mini_golf_paint_util_7c(
uint8 direction,
uint32 image_id,
@ -978,15 +1030,15 @@ void vehicle_visual_mini_golf_player(int x, int imageDirection, int y, int z, rc
return;
}
if (RCT2_GLOBAL(RCT2_ADDRESS_CURRENT_VIEWPORT_FLAGS, uint16) & VIEWPORT_FLAG_INVISIBLE_PEEPS) {
if (gCurrentViewportFlags & VIEWPORT_FLAG_INVISIBLE_PEEPS) {
return;
}
rct_ride_entry *rideType = get_ride_entry(get_ride(vehicle->ride)->subtype);
rct_sprite *sprite = get_sprite(vehicle->peep[0]);
uint32 eax = RCT2_ADDRESS(0x008B8F74, uint32)[vehicle->var_D4];
uint32 ebx = (RCT2_GLOBAL(eax + vehicle->var_C5, uint8) << 2) + (imageDirection >> 3);
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;
uint32 peep_palette = sprite->peep.tshirt_colour << 19 | sprite->peep.trousers_colour << 24 | 0x0A0000000;
@ -998,7 +1050,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;
}
@ -1007,7 +1059,7 @@ void vehicle_visual_mini_golf_ball(int x, int imageDirection, int y, int z, rct_
return;
}
if (RCT2_GLOBAL(RCT2_ADDRESS_CURRENT_VIEWPORT_FLAGS, uint16) & VIEWPORT_FLAG_INVISIBLE_PEEPS) {
if (gCurrentViewportFlags & VIEWPORT_FLAG_INVISIBLE_PEEPS) {
return;
}

2
src/ride/ride.c
View File

@ -4555,7 +4555,7 @@ static 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) {

11
src/ride/vehicle.c
View File

@ -7621,6 +7621,8 @@ loc_6DBE7F:
return false;
}
extern const uint8 mini_golf_peep_animation_lengths[];
/**
* rct2: 0x006DC3A7
*
@ -7671,10 +7673,9 @@ loc_6DC462:
loc_6DC476:
if (vehicle->mini_golf_flags & (1 << 2)) {
regs.edi = RCT2_ADDRESS(0x008B8F74, uint32)[vehicle->var_D4];
regs.al = vehicle->var_C5 + 1;
if ((uint8)regs.al < ((uint8*)regs.edi)[-1]) {
vehicle->var_C5 = regs.al;
uint8 nextFrame = vehicle->var_C5 + 1;
if (nextFrame < mini_golf_peep_animation_lengths[vehicle->mini_golf_current_animation]) {
vehicle->var_C5 = nextFrame;
goto loc_6DC985;
}
vehicle->mini_golf_flags &= ~(1 << 2);
@ -7852,7 +7853,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