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

Paint Merry-go-round (#3653)

This commit is contained in:
Marijn van der Werf 2016-05-18 21:48:05 +02:00 committed by Ted John
parent 1eb6a529bf
commit 5ee6855cdd
3 changed files with 151 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

148
src/ride/gentle/merry_go_round.c
View File

@ -13,3 +13,151 @@
* A full copy of the GNU General Public License can be found in licence.txt
*****************************************************************************/
#pragma endregion
#include "../../interface/viewport.h"
#include "../../paint/paint.h"
#include "../../paint/supports.h"
#include "../track_paint.h"
/** rct2: 0x0142805C */
static const uint32 merry_go_round_rider_offsets[] = {
0, 32, 64, 96, 16, 48, 80, 112
};
/** rct2: 0x0142807C */
static const uint16 merry_go_round_breakdown_vibration[] = {
0, 1, 2, 3, 4, 3, 2, 1, 0, 0
};
/**
* rct2: 0x0076287D
*/
static void paint_merry_go_round_structure(uint8 rideIndex, uint8 direction, sint8 xOffset, sint8 yOffset, uint16 height)
{
rct_map_element * savedMapElement = RCT2_GLOBAL(0x009DE578, rct_map_element*);
height += 7;
rct_ride * ride = get_ride(rideIndex);
rct_ride_entry * ride_type = get_ride_entry(ride->subtype);
rct_vehicle * vehicle = NULL;
uint32 baseImageId = ride_type->vehicles[0].base_image_id;
if (ride->lifecycle_flags & RIDE_LIFECYCLE_ON_TRACK
&& ride->vehicles[0] != SPRITE_INDEX_NULL) {
RCT2_GLOBAL(RCT2_ADDRESS_PAINT_SETUP_CURRENT_TYPE, uint8) = VIEWPORT_INTERACTION_ITEM_SPRITE;
vehicle = GET_VEHICLE(ride->vehicles[0]);
RCT2_GLOBAL(0x009DE578, rct_vehicle*) = vehicle;
if (ride->lifecycle_flags & (RIDE_LIFECYCLE_BREAKDOWN_PENDING | RIDE_LIFECYCLE_BROKEN_DOWN)
&& ride->breakdown_reason_pending == BREAKDOWN_CONTROL_FAILURE
&& ride->breakdown_sound_modifier >= 128) {
height += merry_go_round_breakdown_vibration[(vehicle->current_time >> 1) & 7];
}
}
uint32 rotationOffset = 0;
if (vehicle != NULL) {
uint32 rotation = ((vehicle->sprite_direction >> 3) + get_current_rotation()) << 5;
rotationOffset = (vehicle->vehicle_sprite_type + rotation) % 128;
}
uint32 imageOffset = rotationOffset & 0x1F;
uint32 imageColourFlags = RCT2_GLOBAL(0x00F441A0, uint32);
if (imageColourFlags == 0x20000000) {
imageColourFlags = ride->vehicle_colours[0].body_colour << 19 | ride->vehicle_colours[0].trim_colour << 24 | 0xA0000000;
}
uint32 imageId = (baseImageId + imageOffset) | imageColourFlags;
sub_98197C(imageId, xOffset, yOffset, 24, 24, 48, height, xOffset + 16, yOffset + 16, height, get_current_rotation());
rct_drawpixelinfo * dpi = RCT2_GLOBAL(0x140E9A8, rct_drawpixelinfo*);
if (dpi->zoom_level == 0
&& ride->lifecycle_flags & RIDE_LIFECYCLE_ON_TRACK
&& vehicle != NULL) {
for (int peep = 0; peep <= 14; peep += 2) {
if (vehicle->num_peeps <= peep) {
break;
}
imageOffset = (merry_go_round_rider_offsets[peep / 2] + rotationOffset) % 128;
imageOffset -= 13;
if (imageOffset >= 68) {
continue;
}
imageColourFlags = vehicle->peep_tshirt_colours[peep] << 19 | vehicle->peep_tshirt_colours[peep + 1] << 24 | 0x0A0000000;
imageId = (baseImageId + 32 + imageOffset) | imageColourFlags;
sub_98199C(imageId, xOffset, yOffset, 24, 24, 48, height, xOffset + 16, yOffset + 16, height, get_current_rotation());
}
}
RCT2_GLOBAL(0x009DE578, rct_map_element*) = savedMapElement;
RCT2_GLOBAL(RCT2_ADDRESS_PAINT_SETUP_CURRENT_TYPE, uint8) = VIEWPORT_INTERACTION_ITEM_RIDE;
}
/**
* rct2: 0x00761B0C
*/
static void paint_merry_go_round(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement)
{
trackSequence = track_map_3x3[direction][trackSequence];
int edges = edges_3x3[trackSequence];
rct_ride * ride = get_ride(rideIndex);
rct_xy16 position = {RCT2_GLOBAL(0x009DE56A, sint16), RCT2_GLOBAL(0x009DE56E, sint16)};
wooden_a_supports_paint_setup((direction & 1), 0, height, RCT2_GLOBAL(0x00F441A0, uint32), NULL);
track_paint_util_paint_floor(edges, RCT2_GLOBAL(0x00F44198, uint32), height, floorSpritesCork, get_current_rotation());
track_paint_util_paint_fences(edges, position, mapElement, ride, RCT2_GLOBAL(0x00F441A0, uint32), height, fenceSpritesRope, get_current_rotation());
switch(trackSequence) {
case 1: paint_merry_go_round_structure(rideIndex, direction, 32, 32, height); break;
case 3: paint_merry_go_round_structure(rideIndex, direction, 32, -32, height); break;
case 5: paint_merry_go_round_structure(rideIndex, direction, 0, -32, height); break;
case 6: paint_merry_go_round_structure(rideIndex, direction, -32, 32, height); break;
case 7: paint_merry_go_round_structure(rideIndex, direction, -32, -32, height); break;
case 8: paint_merry_go_round_structure(rideIndex, direction, -32, 0, height); break;
}
int cornerSegments = 0;
switch (trackSequence) {
case 1:
// top
cornerSegments = SEGMENT_B4 | SEGMENT_C8 | SEGMENT_CC;
break;
case 3:
// right
cornerSegments = SEGMENT_CC | SEGMENT_BC | SEGMENT_D4;
break;
case 6:
// left
cornerSegments = SEGMENT_C8 | SEGMENT_B8 | SEGMENT_D0;
break;
case 7:
// bottom
cornerSegments = SEGMENT_D0 | SEGMENT_C0 | SEGMENT_D4;
break;
}
paint_util_set_segment_support_height(cornerSegments, height + 2, 0x20);
paint_util_set_segment_support_height(SEGMENTS_ALL & ~cornerSegments, 0xFFFF, 0);
paint_util_set_general_support_height(height + 64, 0x20);
}
/**
* rct2: 0x0076190C
*/
TRACK_PAINT_FUNCTION get_track_paint_function_merry_go_round(int trackType, int direction)
{
if (trackType != 123) {
return NULL;
}
return paint_merry_go_round;
}

4
src/ride/track_data.c
View File

@ -5500,7 +5500,7 @@ const uint32 RideTypeTrackPaintFunctionsOld[91] = {
0, // RIDE_TYPE_DRINK_STALL
0, // RIDE_TYPE_1F
0, // RIDE_TYPE_SHOP
0x0076190C, // RIDE_TYPE_MERRY_GO_ROUND
0, // RIDE_TYPE_MERRY_GO_ROUND
0, // RIDE_TYPE_22
0, // RIDE_TYPE_INFORMATION_KIOSK
0, // RIDE_TYPE_TOILETS
@ -5595,7 +5595,7 @@ const TRACK_PAINT_FUNCTION_GETTER RideTypeTrackPaintFunctions[91] = {
get_track_paint_function_shop, // RIDE_TYPE_DRINK_STALL
get_track_paint_function_shop, // RIDE_TYPE_1F
get_track_paint_function_shop, // RIDE_TYPE_SHOP
0, // RIDE_TYPE_MERRY_GO_ROUND
get_track_paint_function_merry_go_round,// RIDE_TYPE_MERRY_GO_ROUND
get_track_paint_function_shop, // RIDE_TYPE_22
get_track_paint_function_shop, // RIDE_TYPE_INFORMATION_KIOSK
get_track_paint_function_facility, // RIDE_TYPE_TOILETS

1
src/ride/track_paint.h
View File

@ -58,6 +58,7 @@ TRACK_PAINT_FUNCTION get_track_paint_function_dodgems(int trackType, int directi
TRACK_PAINT_FUNCTION get_track_paint_function_3d_cinema(int trackType, int direction);
TRACK_PAINT_FUNCTION get_track_paint_function_topspin(int trackType, int direction);
TRACK_PAINT_FUNCTION get_track_paint_function_shop(int trackType, int direction);
TRACK_PAINT_FUNCTION get_track_paint_function_merry_go_round(int trackType, int direction);
TRACK_PAINT_FUNCTION get_track_paint_function_facility(int trackType, int direction);
TRACK_PAINT_FUNCTION get_track_paint_function_circus_show(int trackType, int direction);
TRACK_PAINT_FUNCTION get_track_paint_function_flying_saucers(int trackType, int direction);