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

Draw swinging inverter ship (#3698)

This commit is contained in:
Marijn van der Werf 2016-05-21 19:31:31 +02:00 committed by Ted John
parent 8442de943d
commit 3c1366eefd
5 changed files with 183 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/ride/gentle/ferris_wheel.c
View File

@ -19,13 +19,6 @@
#include "../../paint/supports.h"
#include "../track_paint.h"
static const uint8 track_map_1x4[][4] = {
{0, 1, 2, 3},
{2, 3, 0, 1},
{2, 3, 0, 1},
{0, 1, 2, 3},
};
static const uint8 edges_1x4_ne_sw[] = {
EDGE_NW | EDGE_SE,
EDGE_NW | EDGE_SE | EDGE_NE,

169
src/ride/thrill/swinging_inverter_ship.c
View File

@ -13,3 +13,172 @@
* 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: 0x01428010 */
static const uint32 swinging_inverter_ship_base_sprite_offset[] = {
0,16,0,16
};
/** rct2: 0x01428020 */
static const uint32 swinging_inverter_ship_animating_base_sprite_offset[] = {
32,33,32,33
};
typedef struct swinging_inverter_ship_bound_box
{
sint16 length_x;
sint16 length_y;
sint16 offset_x;
sint16 offset_y;
} swinging_inverter_ship_bound_box;
/** rct2: 0x01428020 */
static const swinging_inverter_ship_bound_box swinging_inverter_ship_bounds[] = {
{32, 16, 0, 8},
{16, 32, 8, 0},
{32, 16, 0, 8},
{16, 32, 8, 0}
};
enum {
SPR_SWINGING_INVERTER_SHIP_FRAME_0 = 21998,
SPR_SWINGING_INVERTER_SHIP_FRAME_1 = 21999,
SPR_SWINGING_INVERTER_SHIP_FRAME_2 = 22000,
SPR_SWINGING_INVERTER_SHIP_FRAME_3 = 22001,
};
static const uint32 swinging_inverter_ship_frame_sprites[] = {
SPR_SWINGING_INVERTER_SHIP_FRAME_0,
SPR_SWINGING_INVERTER_SHIP_FRAME_1,
SPR_SWINGING_INVERTER_SHIP_FRAME_2,
SPR_SWINGING_INVERTER_SHIP_FRAME_3
};
static void paint_swinging_inverter_ship_structure(rct_ride * ride, uint8 direction, sint8 axisOffset, uint16 height)
{
uint32 imageId, baseImageId;
rct_map_element * savedMapElement = RCT2_GLOBAL(0x009DE578, rct_map_element*);
rct_ride_entry * rideType = get_ride_entry(ride->subtype);
rct_vehicle * vehicle = NULL;
sint8 xOffset = !(direction & 1) ? axisOffset : 0;
sint8 yOffset = (direction & 1) ? axisOffset : 0;
if (ride->lifecycle_flags & RIDE_LIFECYCLE_ON_TRACK
&& ride->vehicles[0] != SPRITE_INDEX_NULL) {
vehicle = GET_VEHICLE(ride->vehicles[0]);
gPaintInteractionType = VIEWPORT_INTERACTION_ITEM_SPRITE;
RCT2_GLOBAL(0x009DE578, rct_vehicle*) = vehicle;
}
uint32 vehicleImageId = rideType->vehicles[0].base_image_id + swinging_inverter_ship_base_sprite_offset[direction];
if (vehicle != NULL) {
sint32 rotation = (sint8) vehicle->vehicle_sprite_type;
if (rotation != 0) {
vehicleImageId = rideType->vehicles[0].base_image_id + swinging_inverter_ship_animating_base_sprite_offset[direction];
if (direction & 2) {
rotation = -rotation;
}
if (rotation < 0) {
rotation += 72;
}
vehicleImageId += (rotation - 1) << 1;
}
}
uint32 colourFlags = RCT2_GLOBAL(0x00F441A0, uint32);
if (colourFlags == 0x20000000) {
colourFlags = ride->vehicle_colours[0].body_colour << 19 | ride->vehicle_colours[0].trim_colour << 24 | 0xA0000000;
}
swinging_inverter_ship_bound_box boundBox = swinging_inverter_ship_bounds[direction];
vehicleImageId = vehicleImageId | colourFlags;
uint32 frameImageId = swinging_inverter_ship_frame_sprites[direction] | RCT2_GLOBAL(0x00F44198, uint32);
if (direction & 2) {
sub_98197C(vehicleImageId, xOffset, yOffset, boundBox.length_x, boundBox.length_y, 127, height, boundBox.offset_x, boundBox.offset_y, height, get_current_rotation());
sub_98199C(frameImageId, xOffset, yOffset, boundBox.length_x, boundBox.length_y, 127, height, boundBox.offset_x, boundBox.offset_y, height, get_current_rotation());
} else {
sub_98197C(frameImageId, xOffset, yOffset, boundBox.length_x, boundBox.length_y, 127, height, boundBox.offset_x, boundBox.offset_y, height, get_current_rotation());
sub_98199C(vehicleImageId, xOffset, yOffset, boundBox.length_x, boundBox.length_y, 127, height, boundBox.offset_x, boundBox.offset_y, height, get_current_rotation());
}
RCT2_GLOBAL(0x009DE578, rct_map_element*) = savedMapElement;
gPaintInteractionType = VIEWPORT_INTERACTION_ITEM_RIDE;
}
/** rct2: 0x00760260 */
static void paint_swinging_inverter_ship(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement)
{
uint8 relativeTrackSequence = track_map_1x4[direction][trackSequence];
rct_ride * ride = get_ride(rideIndex);
rct_xy16 position = {RCT2_GLOBAL(0x009DE56A, sint16), RCT2_GLOBAL(0x009DE56E, sint16)};
uint32 imageId;
if (relativeTrackSequence != 1 && relativeTrackSequence != 3) {
if (direction & 1) {
metal_a_supports_paint_setup(0, 6, 0, height, RCT2_GLOBAL(0x00F4419C, uint32));
metal_a_supports_paint_setup(0, 7, 0, height, RCT2_GLOBAL(0x00F4419C, uint32));
} else {
metal_a_supports_paint_setup(0, 5, 0, height, RCT2_GLOBAL(0x00F4419C, uint32));
metal_a_supports_paint_setup(0, 8, 0, height, RCT2_GLOBAL(0x00F4419C, uint32));
}
imageId = SPR_STATION_BASE_D | RCT2_GLOBAL(0x00F4419C, uint32);
sub_98196C(imageId, 0, 0, 32, 32, 1, height, get_current_rotation());
switch (direction) {
case 0:
imageId = SPR_STATION_PLATFORM_SW_NE | RCT2_GLOBAL(0x00F44198, uint32);
sub_98196C(imageId, 0, 24, 32, 8, 1, height + 9, get_current_rotation());
break;
case 1:
imageId = SPR_STATION_PLATFORM_NW_SE | RCT2_GLOBAL(0x00F44198, uint32);
sub_98196C(imageId, 24, 0, 8, 32, 1, height + 9, get_current_rotation());
break;
case 2:
imageId = SPR_STATION_PLATFORM_SW_NE | RCT2_GLOBAL(0x00F44198, uint32);
sub_98199C(imageId, 0, 0, 32, 8, 1, height + 9, -2, 0, height, get_current_rotation());
break;
case 3:
imageId = SPR_STATION_PLATFORM_NW_SE | RCT2_GLOBAL(0x00F44198, uint32);
sub_98199C(imageId, 0, 0, 8, 32, 1, height + 9, 0, -2, height, get_current_rotation());
break;
}
}
switch (relativeTrackSequence) {
case 1: paint_swinging_inverter_ship_structure(ride, direction, 48, height + 7); break;
case 2: paint_swinging_inverter_ship_structure(ride, direction, 16, height + 7); break;
case 0: paint_swinging_inverter_ship_structure(ride, direction, -16, height + 7); break;
case 3: paint_swinging_inverter_ship_structure(ride, direction, -48, height + 7); break;
}
paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0);
paint_util_set_general_support_height(height + 176, 0x20);
}
/**
* rct2: 0x00760070
*/
TRACK_PAINT_FUNCTION get_track_paint_function_swinging_inverter_ship(int trackType, int direction)
{
if (trackType != 119) {
return NULL;
}
return paint_swinging_inverter_ship;
}

4
src/ride/track_data.c
View File

@ -5494,7 +5494,7 @@ const uint32 RideTypeTrackPaintFunctionsOld[91] = {
0, // RIDE_TYPE_RIVER_RAPIDS
0, // RIDE_TYPE_DODGEMS
0, // RIDE_TYPE_PIRATE_SHIP
0x00760070, // RIDE_TYPE_SWINGING_INVERTER_SHIP
0, // RIDE_TYPE_SWINGING_INVERTER_SHIP
0, // RIDE_TYPE_FOOD_STALL
0, // RIDE_TYPE_1D
0, // RIDE_TYPE_DRINK_STALL
@ -5589,7 +5589,7 @@ const TRACK_PAINT_FUNCTION_GETTER RideTypeTrackPaintFunctions[91] = {
get_track_paint_function_river_rapids, // RIDE_TYPE_RIVER_RAPIDS
get_track_paint_function_dodgems, // RIDE_TYPE_DODGEMS
get_track_paint_function_pirate_ship, // RIDE_TYPE_PIRATE_SHIP
0, // RIDE_TYPE_SWINGING_INVERTER_SHIP
get_track_paint_function_swinging_inverter_ship, // RIDE_TYPE_SWINGING_INVERTER_SHIP
get_track_paint_function_shop, // RIDE_TYPE_FOOD_STALL
get_track_paint_function_shop, // RIDE_TYPE_1D
get_track_paint_function_shop, // RIDE_TYPE_DRINK_STALL

7
src/ride/track_paint.c
View File

@ -105,6 +105,13 @@ const uint8 edges_4x4[] = {
EDGE_SW | EDGE_SE
};
const uint8 track_map_1x4[][4] = {
{0, 1, 2, 3},
{2, 3, 0, 1},
{2, 3, 0, 1},
{0, 1, 2, 3},
};
const uint32 floorSpritesCork[] = {
SPR_FLOOR_CORK_SE_SW,
SPR_FLOOR_CORK_SW,

5
src/ride/track_paint.h
View File

@ -31,6 +31,8 @@ extern const uint8 edges_3x3[];
extern const uint8 track_map_4x4[][16];
extern const uint8 edges_4x4[];
extern const uint8 track_map_1x4[][4];
enum {
SPR_FLOOR_PLANKS = 3395,
SPR_FLOOR_PLANKS_90_DEG = 3396,
@ -135,6 +137,8 @@ enum {
SPR_STATION_BASE_B_SW_NE = 22428,
SPR_STATION_BASE_B_NW_SE = 22429,
SPR_STATION_BASE_D = 22432,
SPR_ON_RIDE_PHOTO_CAMERA_N = 25615,
SPR_ON_RIDE_PHOTO_CAMERA_E = 25616,
SPR_ON_RIDE_PHOTO_CAMERA_S = 25617,
@ -181,6 +185,7 @@ TRACK_PAINT_FUNCTION get_track_paint_function_spiral_slide(int trackType, int di
TRACK_PAINT_FUNCTION get_track_paint_function_river_rapids(int trackType, int direction);
TRACK_PAINT_FUNCTION get_track_paint_function_dodgems(int trackType, int direction);
TRACK_PAINT_FUNCTION get_track_paint_function_pirate_ship(int trackType, int direction);
TRACK_PAINT_FUNCTION get_track_paint_function_swinging_inverter_ship(int trackType, int direction);
TRACK_PAINT_FUNCTION get_track_paint_function_ferris_wheel(int trackType, int direction);
TRACK_PAINT_FUNCTION get_track_paint_function_motionsimulator(int trackType, int direction);
TRACK_PAINT_FUNCTION get_track_paint_function_3d_cinema(int trackType, int direction);