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

Implement Dodgems track drawing

This commit is contained in:
Marijn van der Werf 2016-03-25 15:43:03 +01:00
parent b499a4589f
commit bdfa1c2a83
5 changed files with 235 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/interface/viewport.c
View File

@ -1139,6 +1139,10 @@ int sub_98198C(
return 1;
}
void sub_68818E(int x, int y, int image_id) {
RCT2_CALLPROC_X(0x0068818E, x, image_id, y, 0, 0, 0, 0);
}
/**
*
* rct2: 0x006D4244

2
src/interface/viewport.h
View File

@ -149,4 +149,6 @@ void screen_get_map_xy_side_with_z(sint16 screenX, sint16 screenY, sint16 z, sin
uint8 get_current_rotation();
void sub_68818E(int x, int y, int image_id);
#endif

4
src/ride/track_data.c
View File

@ -5496,7 +5496,7 @@ const uint32 RideTypeTrackPaintFunctionsOld[91] = {
0x0074A668, // RIDE_TYPE_GO_KARTS
0x0074DDEC, // RIDE_TYPE_LOG_FLUME
0x0075745C, // RIDE_TYPE_RIVER_RAPIDS
0x0075C9D0, // RIDE_TYPE_DODGEMS
0, // RIDE_TYPE_DODGEMS
0x008A83E0, // RIDE_TYPE_PIRATE_SHIP
0x00760070, // RIDE_TYPE_SWINGING_INVERTER_SHIP
0, // RIDE_TYPE_FOOD_STALL
@ -5591,7 +5591,7 @@ const TRACK_PAINT_FUNCTION_GETTER RideTypeTrackPaintFunctions[91] = {
0, // RIDE_TYPE_GO_KARTS
0, // RIDE_TYPE_LOG_FLUME
0, // RIDE_TYPE_RIVER_RAPIDS
0, // RIDE_TYPE_DODGEMS
get_track_paint_function_dodgems, // RIDE_TYPE_DODGEMS
0, // RIDE_TYPE_PIRATE_SHIP
0, // RIDE_TYPE_SWINGING_INVERTER_SHIP
get_track_paint_function_shop, // RIDE_TYPE_FOOD_STALL

226
src/ride/track_paint.c
View File

@ -1033,6 +1033,232 @@ TRACK_PAINT_FUNCTION get_track_paint_function_maze(int trackType, int direction)
return maze_paint_setup;
}
enum {
DODGEMS_FLOOR = 21925,
DODGEMS_ROOF_FRAME = 21926, // 4 directions
DODGEMS_ROOF_GLASS = 21930, // 4 directions
DODGEMS_FENCE_TOP_RIGHT = 21934,
DODGEMS_FENCE_BOTTOM_RIGHT = 21935,
DODGEMS_FENCE_BOTTOM_LEFT = 21936,
DODGEMS_FENCE_TOP_LEFT = 21937
};
static void dodgems_paint_sub_floor(uint8 direction, int height) {
uint32 image_id = RCT2_GLOBAL(0x00F441A0, uint32);
wooden_a_supports_paint_setup(direction & 1, 0, height, image_id, NULL);
image_id = DODGEMS_FLOOR | RCT2_GLOBAL(0x00F4419C, uint32);
sub_98197C(image_id, 0, 0, 30, 30, 1, height, 1, 1, height, get_current_rotation());
}
static void dodgems_paint_sub_fence_top_left(uint8 rideIndex, int height, rct_map_element *mapElement) {
sint16 x = RCT2_GLOBAL(0x009DE56A, sint16), y = RCT2_GLOBAL(0x009DE56E, sint16);
uint16 entranceLoc =
((x / 32) + loc_7667AE[get_current_rotation()].x) |
(((y / 32) + loc_7667AE[get_current_rotation()].y) << 8);
uint8 entranceId = (mapElement->properties.track.sequence & 0x70) >> 4;
rct_ride *ride = get_ride(rideIndex);
if (ride->entrances[entranceId] == entranceLoc || ride->exits[entranceId] == entranceLoc) {
return;
}
uint32 image_id = DODGEMS_FENCE_TOP_LEFT | RCT2_GLOBAL(0x00F4419C, uint32);
sub_98199C(image_id, 0, 0, 32, 1, 7, height, 0, 2, height + 2, get_current_rotation());
}
static void dodgems_paint_sub_fence_top_right(uint8 rideIndex, int height, rct_map_element *mapElement) {
sint16 x = RCT2_GLOBAL(0x009DE56A, sint16), y = RCT2_GLOBAL(0x009DE56E, sint16);
uint16 entranceLoc =
((x / 32) + loc_7667AC[get_current_rotation()].x) |
(((y / 32) + loc_7667AC[get_current_rotation()].y) << 8);
uint8 entranceId = (mapElement->properties.track.sequence & 0x70) >> 4;
rct_ride *ride = get_ride(rideIndex);
if (ride->entrances[entranceId] == entranceLoc || ride->exits[entranceId] == entranceLoc) {
return;
}
uint32 image_id = DODGEMS_FENCE_TOP_RIGHT | RCT2_GLOBAL(0x00F4419C, uint32);
sub_98199C(image_id, 0, 0, 1, 32, 7, height, 2, 0, height + 2, get_current_rotation());
}
static void dodgems_paint_sub_fence_bottom_right(uint8 rideIndex, int height, rct_map_element *mapElement) {
uint32 image_id = DODGEMS_FENCE_BOTTOM_RIGHT | RCT2_GLOBAL(0x00F4419C, uint32);
sub_98197C(image_id, 0, 0, 32, 1, 7, height, 0, 30, height + 2, get_current_rotation());
}
static void dodgems_paint_sub_fence_bottom_left(uint8 rideIndex, int height, rct_map_element *mapElement) {
uint32 image_id = DODGEMS_FENCE_BOTTOM_LEFT | RCT2_GLOBAL(0x00F4419C, uint32);
sub_98197C(image_id, 0, 0, 1, 13, 7, height, 30, 0, height + 2, get_current_rotation());
}
static void dodgems_paint_sub_roof(int height, int offset) {
uint32 image_id = (DODGEMS_ROOF_FRAME + offset) | RCT2_GLOBAL(0x00F44198, uint32);
sub_98196C(image_id, 0, 0, 32, 32, 2, height, get_current_rotation());
image_id = (DODGEMS_ROOF_GLASS + offset) | (0xF << 19) | (0x1 << 24) | 0x40000000;
sub_68818E(0, 0, image_id);
}
static void dodgems_paint_setup_rot_0(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element *mapElement) {
dodgems_paint_sub_floor(direction, height);
switch (trackSequence) {
case 0:
dodgems_paint_sub_fence_top_left(rideIndex, height, mapElement);
dodgems_paint_sub_fence_top_right(rideIndex, height, mapElement);
break;
case 1:
case 2:
dodgems_paint_sub_fence_top_right(rideIndex, height, mapElement);
break;
case 3:
dodgems_paint_sub_fence_top_right(rideIndex, height, mapElement);
dodgems_paint_sub_fence_bottom_right(rideIndex, height, mapElement);
break;
case 4:
case 8:
dodgems_paint_sub_fence_top_left(rideIndex, height, mapElement);
break;
case 7:
case 11:
dodgems_paint_sub_fence_bottom_right(rideIndex, height, mapElement);
break;
case 12:
dodgems_paint_sub_fence_top_left(rideIndex, height, mapElement);
dodgems_paint_sub_fence_bottom_left(rideIndex, height, mapElement);
break;
case 13:
case 14:
dodgems_paint_sub_fence_bottom_left(rideIndex, height, mapElement);
break;
case 15:
dodgems_paint_sub_fence_bottom_right(rideIndex, height, mapElement);
dodgems_paint_sub_fence_bottom_left(rideIndex, height, mapElement);
break;
}
height += 30;
if ((trackSequence / 4) & 1) {
dodgems_paint_sub_roof(height, 0);
} else {
dodgems_paint_sub_roof(height, 2);
}
height += 6;
for (int i = 0; i < 9; ++i) {
RCT2_GLOBAL(0x141E9B4 + i * 4, uint16) = height;
RCT2_GLOBAL(0x141E9B6 + i * 4, uint8) = 0x20;
}
height += 12;
if (RCT2_GLOBAL(RCT2_ADDRESS_CURRENT_PAINT_TILE_MAX_HEIGHT, sint16) < height) {
RCT2_GLOBAL(RCT2_ADDRESS_CURRENT_PAINT_TILE_MAX_HEIGHT, sint16) = height;
RCT2_GLOBAL(0x141E9DA, uint8) = 0x20;
}
}
static void dodgems_paint_setup_rot_1(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element *mapElement) {
dodgems_paint_sub_floor(direction, height);
switch (trackSequence) {
case 0:
dodgems_paint_sub_fence_top_right(rideIndex, height, mapElement);
dodgems_paint_sub_fence_bottom_right(rideIndex, height, mapElement);
break;
case 1:
case 2:
dodgems_paint_sub_fence_bottom_right(rideIndex, height, mapElement);
break;
case 3:
dodgems_paint_sub_fence_bottom_right(rideIndex, height, mapElement);
dodgems_paint_sub_fence_bottom_left(rideIndex, height, mapElement);
break;
case 4:
case 8:
dodgems_paint_sub_fence_top_right(rideIndex, height, mapElement);
break;
case 7:
case 11:
dodgems_paint_sub_fence_bottom_left(rideIndex, height, mapElement);
break;
case 12:
dodgems_paint_sub_fence_top_left(rideIndex, height, mapElement);
dodgems_paint_sub_fence_top_right(rideIndex, height, mapElement);
break;
case 13:
case 14:
dodgems_paint_sub_fence_top_left(rideIndex, height, mapElement);
break;
case 15:
dodgems_paint_sub_fence_top_left(rideIndex, height, mapElement);
dodgems_paint_sub_fence_bottom_left(rideIndex, height, mapElement);
break;
}
height += 30;
if ((trackSequence / 4) & 1) {
dodgems_paint_sub_roof(height, 1);
} else {
dodgems_paint_sub_roof(height, 3);
}
height += 6;
for (int i = 0; i < 9; ++i) {
RCT2_GLOBAL(0x141E9B4 + i * 4, uint16) = height;
RCT2_GLOBAL(0x141E9B6 + i * 4, uint8) = 0x20;
}
height += 12;
if (RCT2_GLOBAL(RCT2_ADDRESS_CURRENT_PAINT_TILE_MAX_HEIGHT, sint16) < height) {
RCT2_GLOBAL(RCT2_ADDRESS_CURRENT_PAINT_TILE_MAX_HEIGHT, sint16) = height;
RCT2_GLOBAL(0x141E9DA, uint8) = 0x20;
}
}
static void dodgems_paint_setup_rot_2(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element *mapElement) {
dodgems_paint_setup_rot_0(rideIndex, 15 - trackSequence, direction, height, mapElement);
}
static void dodgems_paint_setup_rot_3(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element *mapElement) {
dodgems_paint_setup_rot_1(rideIndex, 15 - trackSequence, direction, height, mapElement);
}
/**
* rct2:
*/
TRACK_PAINT_FUNCTION get_track_paint_function_dodgems(int trackType, int direction) {
if (trackType != 111) {
return NULL;
}
switch (direction) {
case 0: return dodgems_paint_setup_rot_0;
case 1: return dodgems_paint_setup_rot_1;
case 2: return dodgems_paint_setup_rot_2;
case 3: return dodgems_paint_setup_rot_3;
}
return NULL;
}
/**
*
* rct2: 0x00761378

1
src/ride/track_paint.h
View File

@ -7,6 +7,7 @@ typedef void (*TRACK_PAINT_FUNCTION)(uint8 rideIndex, uint8 trackSequence, uint8
typedef TRACK_PAINT_FUNCTION (*TRACK_PAINT_FUNCTION_GETTER)(int trackType, int direction);
TRACK_PAINT_FUNCTION get_track_paint_function_maze(int trackType, int direction);
TRACK_PAINT_FUNCTION get_track_paint_function_dodgems(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_facility(int trackType, int direction);