mirror of https://github.com/OpenRCT2/OpenRCT2.git
Merge pull request #10981 from Gymnasiast/fix/8151
Fix #8151: Game freezes upon demolishing mazes at odd heights
This commit is contained in:
commit
ab50c888ff
|
@ -15,6 +15,7 @@
|
||||||
- Fix: [#7784] Vehicle tab takes 1st car colour instead of tab_vehicle's colour.
|
- Fix: [#7784] Vehicle tab takes 1st car colour instead of tab_vehicle's colour.
|
||||||
- Fix: [#7854] Cannot build a custom spiral roller coaster design.
|
- Fix: [#7854] Cannot build a custom spiral roller coaster design.
|
||||||
- Fix: [#7854] Empty entries in spiral roller coaster designs list.
|
- Fix: [#7854] Empty entries in spiral roller coaster designs list.
|
||||||
|
- Fix: [#8151] Game freezes upon demolishing mazes at odd heights.
|
||||||
- Fix: [#8875] RCT1 competition scenarios are classified incorrectly.
|
- Fix: [#8875] RCT1 competition scenarios are classified incorrectly.
|
||||||
- Fix: [#10176] Mistake in the sprite for the land tool's 6x6 grid.
|
- Fix: [#10176] Mistake in the sprite for the land tool's 6x6 grid.
|
||||||
- Fix: [#10196] Doors unable to be placed at end of track corners.
|
- Fix: [#10196] Doors unable to be placed at end of track corners.
|
||||||
|
|
|
@ -86,7 +86,7 @@ public:
|
||||||
res->ErrorMessage = STR_TILE_ELEMENT_LIMIT_REACHED;
|
res->ErrorMessage = STR_TILE_ELEMENT_LIMIT_REACHED;
|
||||||
return res;
|
return res;
|
||||||
}
|
}
|
||||||
if ((_loc.z & 0xF) != 0)
|
if ((_loc.z & 0xF) != 0 && _mode == GC_SET_MAZE_TRACK_BUILD)
|
||||||
{
|
{
|
||||||
res->Error = GA_ERROR::UNKNOWN;
|
res->Error = GA_ERROR::UNKNOWN;
|
||||||
res->ErrorMessage = STR_CONSTRUCTION_ERR_UNKNOWN;
|
res->ErrorMessage = STR_CONSTRUCTION_ERR_UNKNOWN;
|
||||||
|
|
|
@ -31,7 +31,7 @@
|
||||||
// This string specifies which version of network stream current build uses.
|
// This string specifies which version of network stream current build uses.
|
||||||
// It is used for making sure only compatible builds get connected, even within
|
// It is used for making sure only compatible builds get connected, even within
|
||||||
// single OpenRCT2 version.
|
// single OpenRCT2 version.
|
||||||
#define NETWORK_STREAM_VERSION "23"
|
#define NETWORK_STREAM_VERSION "24"
|
||||||
#define NETWORK_STREAM_ID OPENRCT2_VERSION "-" NETWORK_STREAM_VERSION
|
#define NETWORK_STREAM_ID OPENRCT2_VERSION "-" NETWORK_STREAM_VERSION
|
||||||
|
|
||||||
static Peep* _pickup_peep = nullptr;
|
static Peep* _pickup_peep = nullptr;
|
||||||
|
|
Loading…
Reference in New Issue