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 #7284: Rotating a maze track rotates each piece individually

Browse Source
This commit is contained in:
Gymnasiast
2018-03-15 21:29:44 +01:00
committed by Michael Steenbeek
parent 5ddf36ad42
commit ddd03fb045
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/openrct2/network/Network.cpp
View File

@@ -33,7 +33,7 @@
// This string specifies which version of network stream current build uses.
// It is used for making sure only compatible builds get connected, even within
// single OpenRCT2 version.
#define NETWORK_STREAM_VERSION "41"
#define NETWORK_STREAM_VERSION "42"
#define NETWORK_STREAM_ID OPENRCT2_VERSION "-" NETWORK_STREAM_VERSION
static rct_peep* _pickup_peep = nullptr;

12
src/openrct2/ride/TrackDesign.cpp
View File

@@ -1194,10 +1194,10 @@ static sint32 track_design_place_maze(rct_track_td6 * td6, sint16 x, sint16 y, s
for (; maze_element->all != 0; maze_element++)
{
uint8 rotation = _currentTrackPieceDirection & 3;
CoordsXY mapCoord = {maze_element->x * 32, maze_element->y * 32};
sint16 tmpX = mapCoord.x;
sint16 tmpY = mapCoord.y;
sint16 tmpX = maze_element->x * 32;
sint16 tmpY = maze_element->y * 32;
rotate_map_coordinates(&tmpX, &tmpY, rotation);
CoordsXY mapCoord = { tmpX, tmpY };
mapCoord.x += x;
mapCoord.y += y;
@@ -1494,10 +1494,10 @@ static bool track_design_place_ride(rct_track_td6 * td6, sint16 x, sint16 y, sin
sint32 tempZ = z - TrackCoordinates[trackType].z_begin;
for (const rct_preview_track * trackBlock = TrackBlocks[trackType]; trackBlock->index != 0xFF; trackBlock++)
{
CoordsXY tile = {x, y};
sint16 tmpX = tile.x;
sint16 tmpY = tile.y;
sint16 tmpX = x;
sint16 tmpY = y;
map_offset_with_rotation(&tmpX, &tmpY, trackBlock->x, trackBlock->y, rotation);
CoordsXY tile = { tmpX, tmpY };
if (tile.x < 0 || tile.y < 0 || tile.x >= (256 * 32) || tile.y >= (256 * 32))
{
continue;