mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2025-12-24 00:03:11 +01:00
Code Issues Releases Wiki Activity

Fix #5943: Track preview for mazes not drawn when paused

Browse Source
This commit is contained in:
rwjuk
2017-07-27 23:18:03 +01:00
committed by Michael Steenbeek
parent d42b9fc6df
commit f6aef817e1
3 changed files with 60 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

76
src/openrct2/ride/track_design.c
View File

@@ -493,8 +493,8 @@ static void track_design_mirror_maze(rct_track_td6 *td6)
maze->y = -maze->y; maze->y = -maze->y;
if (maze->type == 0x8 || maze->type == 0x80) { if (maze->type == 0x8 || maze->type == 0x80) {
if (maze->unk_2 & 1) { if (maze->direction & 1) {
maze->unk_2 ^= (1 << 1); maze->direction ^= (1 << 1);
} }
continue; continue;
} }
@@ -926,10 +926,10 @@ static sint32 track_design_place_maze(rct_track_td6 *td6, sint16 x, sint16 y, si
_trackDesignPlaceZ = 0; _trackDesignPlaceZ = 0;
_trackDesignPlaceCost = 0; _trackDesignPlaceCost = 0;
rct_td6_maze_element *maze = td6->maze_elements; rct_td6_maze_element *maze_element = td6->maze_elements;
for (; maze->all != 0; maze++){ for (; maze_element->all != 0; maze_element++){
uint8 rotation = _currentTrackPieceDirection & 3; uint8 rotation = _currentTrackPieceDirection & 3;
rct_xy16 mapCoord = { .x = maze->x * 32, .y = maze->y * 32 }; rct_xy16 mapCoord = { .x = maze_element->x * 32, .y = maze_element->y * 32 };
rotate_map_coordinates(&mapCoord.x, &mapCoord.y, rotation); rotate_map_coordinates(&mapCoord.x, &mapCoord.y, rotation);
mapCoord.x += x; mapCoord.x += x;
mapCoord.y += y; mapCoord.y += y;
@@ -945,58 +945,84 @@ static sint32 track_design_place_maze(rct_track_td6 *td6, sint16 x, sint16 y, si
_trackDesignPlaceOperation == PTD_OPERATION_4 || _trackDesignPlaceOperation == PTD_OPERATION_4 ||
_trackDesignPlaceOperation == PTD_OPERATION_GET_COST _trackDesignPlaceOperation == PTD_OPERATION_GET_COST
) { ) {
uint8 bl; uint8 flags;
money32 cost = 0; money32 cost = 0;
uint16 maze_entry; uint16 maze_entry;
switch (maze->type) { switch (maze_element->type) {
case 0x08: case MAZE_ELEMENT_TYPE_ENTRANCE:
// entrance // entrance
rotation += maze->unk_2; rotation += maze_element->direction;
rotation &= 3; rotation &= 3;
flags = GAME_COMMAND_FLAG_APPLY;
gGameCommandErrorTitle = STR_RIDE_CONSTRUCTION_CANT_CONSTRUCT_THIS_HERE; gGameCommandErrorTitle = STR_RIDE_CONSTRUCTION_CANT_CONSTRUCT_THIS_HERE;
bl = 1;
if (_trackDesignPlaceOperation == PTD_OPERATION_4) bl = 0x69;
if (_trackDesignPlaceOperation == PTD_OPERATION_1) { if (_trackDesignPlaceOperation == PTD_OPERATION_1) {
cost = game_do_command(mapCoord.x, 0 | rotation << 8, mapCoord.y, (z / 16) & 0xFF, GAME_COMMAND_PLACE_RIDE_ENTRANCE_OR_EXIT, -1, 0); cost = game_do_command(mapCoord.x, 0 | rotation << 8, mapCoord.y, (z / 16) & 0xFF, GAME_COMMAND_PLACE_RIDE_ENTRANCE_OR_EXIT, -1, 0);
} else { } else {
cost = game_do_command(mapCoord.x, bl | rotation << 8, mapCoord.y, rideIndex, GAME_COMMAND_PLACE_RIDE_ENTRANCE_OR_EXIT, 0, 0); if (_trackDesignPlaceOperation == PTD_OPERATION_GET_COST)
{
flags = GAME_COMMAND_FLAG_ALLOW_DURING_PAUSED | GAME_COMMAND_FLAG_5;
}
else if (_trackDesignPlaceOperation == PTD_OPERATION_4)
{
flags = GAME_COMMAND_FLAG_APPLY | GAME_COMMAND_FLAG_ALLOW_DURING_PAUSED | GAME_COMMAND_FLAG_5 | GAME_COMMAND_FLAG_GHOST;
}
cost = game_do_command(mapCoord.x, flags | rotation << 8, mapCoord.y, rideIndex, GAME_COMMAND_PLACE_RIDE_ENTRANCE_OR_EXIT, 0, 0);
} }
if (cost != MONEY32_UNDEFINED){ if (cost != MONEY32_UNDEFINED){
_trackDesignPlaceStateEntranceExitPlaced = true; _trackDesignPlaceStateEntranceExitPlaced = true;
} }
break; break;
case 0x80: case MAZE_ELEMENT_TYPE_EXIT:
// exit // exit
rotation += maze->unk_2; rotation += maze_element->direction;
rotation &= 3; rotation &= 3;
flags = GAME_COMMAND_FLAG_APPLY;
gGameCommandErrorTitle = STR_RIDE_CONSTRUCTION_CANT_CONSTRUCT_THIS_HERE; gGameCommandErrorTitle = STR_RIDE_CONSTRUCTION_CANT_CONSTRUCT_THIS_HERE;
bl = 1;
if (_trackDesignPlaceOperation == PTD_OPERATION_4) bl = 0x69;
if (_trackDesignPlaceOperation == PTD_OPERATION_1) { if (_trackDesignPlaceOperation == PTD_OPERATION_1) {
cost = game_do_command(mapCoord.x, 0 | rotation << 8, mapCoord.y, ((z / 16) & 0xFF) | (1 << 8), GAME_COMMAND_PLACE_RIDE_ENTRANCE_OR_EXIT, -1, 0); cost = game_do_command(mapCoord.x, 0 | rotation << 8, mapCoord.y, ((z / 16) & 0xFF) | (1 << 8), GAME_COMMAND_PLACE_RIDE_ENTRANCE_OR_EXIT, -1, 0);
} }
else{ else {
cost = game_do_command(mapCoord.x, bl | rotation << 8, mapCoord.y, rideIndex | (1 << 8), GAME_COMMAND_PLACE_RIDE_ENTRANCE_OR_EXIT, 0, 0); if (_trackDesignPlaceOperation == PTD_OPERATION_GET_COST)
{
flags = GAME_COMMAND_FLAG_ALLOW_DURING_PAUSED | GAME_COMMAND_FLAG_5;
}
else if (_trackDesignPlaceOperation == PTD_OPERATION_4)
{
flags = GAME_COMMAND_FLAG_APPLY | GAME_COMMAND_FLAG_ALLOW_DURING_PAUSED | GAME_COMMAND_FLAG_5 | GAME_COMMAND_FLAG_GHOST;
}
cost = game_do_command(mapCoord.x, flags | rotation << 8, mapCoord.y, rideIndex | (1 << 8), GAME_COMMAND_PLACE_RIDE_ENTRANCE_OR_EXIT, 0, 0);
} }
if (cost != MONEY32_UNDEFINED){ if (cost != MONEY32_UNDEFINED){
_trackDesignPlaceStateEntranceExitPlaced = true; _trackDesignPlaceStateEntranceExitPlaced = true;
} }
break; break;
default: default:
maze_entry = rol16(maze->maze_entry, rotation * 4); maze_entry = rol16(maze_element->maze_entry, rotation * 4);
bl = 1; if (_trackDesignPlaceOperation == PTD_OPERATION_GET_COST)
if (_trackDesignPlaceOperation == PTD_OPERATION_GET_COST) bl = 0x29; {
if (_trackDesignPlaceOperation == PTD_OPERATION_4) bl = 0x69; flags = GAME_COMMAND_FLAG_ALLOW_DURING_PAUSED | GAME_COMMAND_FLAG_5;
if (_trackDesignPlaceOperation == PTD_OPERATION_1) bl = 0; }
else if (_trackDesignPlaceOperation == PTD_OPERATION_4)
{
flags = GAME_COMMAND_FLAG_APPLY | GAME_COMMAND_FLAG_ALLOW_DURING_PAUSED | GAME_COMMAND_FLAG_5 | GAME_COMMAND_FLAG_GHOST;
}
else if (_trackDesignPlaceOperation == PTD_OPERATION_1)
{
flags = 0;
}
else
{
flags = GAME_COMMAND_FLAG_APPLY;
}
gGameCommandErrorTitle = STR_RIDE_CONSTRUCTION_CANT_CONSTRUCT_THIS_HERE; gGameCommandErrorTitle = STR_RIDE_CONSTRUCTION_CANT_CONSTRUCT_THIS_HERE;
cost = game_do_command(mapCoord.x, bl | (maze_entry & 0xFF) << 8, mapCoord.y, rideIndex | (maze_entry & 0xFF00), GAME_COMMAND_PLACE_MAZE_DESIGN, z, 0); cost = game_do_command(mapCoord.x, flags | (maze_entry & 0xFF) << 8, mapCoord.y, rideIndex | (maze_entry & 0xFF00), GAME_COMMAND_PLACE_MAZE_DESIGN, z, 0);
break; break;
} }

8
src/openrct2/ride/track_design.h
View File

@@ -37,7 +37,7 @@ typedef struct rct_td6_maze_element {
union { union {
uint16 maze_entry; uint16 maze_entry;
struct{ struct{
uint8 unk_2; uint8 direction;
uint8 type; uint8 type;
}; };
}; };
@@ -191,6 +191,12 @@ enum {
PTD_OPERATION_CLEAR_OUTLINES, PTD_OPERATION_CLEAR_OUTLINES,
}; };
enum {
MAZE_ELEMENT_TYPE_MAZE_TRACK = 0,
MAZE_ELEMENT_TYPE_ENTRANCE = (1 << 3),
MAZE_ELEMENT_TYPE_EXIT = (1 << 7)
};
extern rct_track_td6 *gActiveTrackDesign; extern rct_track_td6 *gActiveTrackDesign;
extern bool gTrackDesignSceneryToggle; extern bool gTrackDesignSceneryToggle;
extern rct_xyz16 gTrackPreviewMin; extern rct_xyz16 gTrackPreviewMin;

4
src/openrct2/ride/track_design_save.c
View File

@@ -883,7 +883,7 @@ static bool track_design_save_to_td6_for_maze(uint8 rideIndex, rct_track_td6 *td
// Add something that stops this from walking off the end // Add something that stops this from walking off the end
uint8 entrance_direction = map_element_get_direction(mapElement); uint8 entrance_direction = map_element_get_direction(mapElement);
maze->unk_2 = entrance_direction; maze->direction = entrance_direction;
maze->type = 8; maze->type = 8;
maze->x = (sint8)((x - startX) / 32); maze->x = (sint8)((x - startX) / 32);
maze->y = (sint8)((y - startY) / 32); maze->y = (sint8)((y - startY) / 32);
@@ -908,7 +908,7 @@ static bool track_design_save_to_td6_for_maze(uint8 rideIndex, rct_track_td6 *td
// Add something that stops this from walking off the end // Add something that stops this from walking off the end
uint8 exit_direction = map_element_get_direction(mapElement); uint8 exit_direction = map_element_get_direction(mapElement);
maze->unk_2 = exit_direction; maze->direction = exit_direction;
maze->type = 0x80; maze->type = 0x80;
maze->x = (sint8)((x - startX) / 32); maze->x = (sint8)((x - startX) / 32);
maze->y = (sint8)((y - startY) / 32); maze->y = (sint8)((y - startY) / 32);