From cc1eee5beebf88ade11288fa99cb7db788109abd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=CE=B6eh=20Matt?= <5415177+ZehMatt@users.noreply.github.com> Date: Sat, 6 May 2023 02:31:46 +0300 Subject: [PATCH 1/4] Fix #20134: Don't update grass length outside of the actual map --- src/openrct2/world/Map.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/openrct2/world/Map.cpp b/src/openrct2/world/Map.cpp index ff4f7604be..315dae62f0 100644 --- a/src/openrct2/world/Map.cpp +++ b/src/openrct2/world/Map.cpp @@ -1335,6 +1335,9 @@ void MapUpdateTiles() for (int32_t blockX = 0; blockX < gMapSize.x; blockX += 256) { auto mapPos = TileCoordsXY{ blockX + x, blockY + y }.ToCoordsXY(); + if (MapIsEdge(mapPos)) + continue; + auto* surfaceElement = MapGetSurfaceElementAt(mapPos); if (surfaceElement != nullptr) { From 4c78c8e512acd4c3efb6592882bf3eea41a1cfa2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=CE=B6eh=20Matt?= <5415177+ZehMatt@users.noreply.github.com> Date: Sat, 6 May 2023 02:34:13 +0300 Subject: [PATCH 2/4] Remove pointless masking --- src/openrct2/world/Map.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/src/openrct2/world/Map.cpp b/src/openrct2/world/Map.cpp index 315dae62f0..ebc35ee974 100644 --- a/src/openrct2/world/Map.cpp +++ b/src/openrct2/world/Map.cpp @@ -1348,7 +1348,6 @@ void MapUpdateTiles() } gGrassSceneryTileLoopPosition++; - gGrassSceneryTileLoopPosition &= 0xFFFF; } } From 627a4f69c274b24ab5a64c5b61fca520eabbfe9c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=CE=B6eh=20Matt?= <5415177+ZehMatt@users.noreply.github.com> Date: Sat, 6 May 2023 02:41:20 +0300 Subject: [PATCH 3/4] Update changelog.txt --- distribution/changelog.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/distribution/changelog.txt b/distribution/changelog.txt index 2077dc0758..be459abb9f 100644 --- a/distribution/changelog.txt +++ b/distribution/changelog.txt @@ -44,6 +44,7 @@ - Fix: [#20033] Asset packs cannot reference game data. - Fix: [#20104] [Plugin] Some network APIs use player index and group index. - Fix: [#20099] Some scrollbar is glitched or have incorrect size when open window for the first time +- Fix: [#20134] Grass length being updated for tiles in the void, causing unneccesary drawing operations. 0.4.4 (2023-03-28) ------------------------------------------------------------------------ From 5683cf9520da8b05a5d251061da2b82b566c19ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=CE=B6eh=20Matt?= <5415177+ZehMatt@users.noreply.github.com> Date: Sat, 6 May 2023 15:35:32 +0300 Subject: [PATCH 4/4] Bump up network version --- src/openrct2/network/NetworkBase.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/openrct2/network/NetworkBase.cpp b/src/openrct2/network/NetworkBase.cpp index d9c82ad5ff..425d52554a 100644 --- a/src/openrct2/network/NetworkBase.cpp +++ b/src/openrct2/network/NetworkBase.cpp @@ -43,7 +43,7 @@ // It is used for making sure only compatible builds get connected, even within // single OpenRCT2 version. -#define NETWORK_STREAM_VERSION "19" +#define NETWORK_STREAM_VERSION "20" #define NETWORK_STREAM_ID OPENRCT2_VERSION "-" NETWORK_STREAM_VERSION