mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-18 12:33:17 +01:00
Code Issues Releases Wiki Activity

Merge pull request #15305 from ZehMatt/fix-15289

Browse Source 
Fix #15289: Duplicated banner correction using the wrong index
This commit is contained in:
ζeh Matt
2021-08-29 10:06:55 -07:00
committed by GitHub
parent cba52b240e 763d086c85
commit a75e07cde6
2 changed files with 38 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
distribution/changelog.txt
View File

@@ -17,6 +17,7 @@
- Fix: [#15184] Crash when hovering over water types in Object Selection.
- Fix: [#15193] Crash when rides/stalls are demolished.
- Fix: [#15255] Tile Inspector shows banner information on walls that do not contain one.
- Fix: [#15289] Unexpected behavior with duplicated banners which also caused desyncs in multiplayer.
- Improved: [#3417] Crash dumps are now placed in their own folder.
- Change: [#8601] Revert ToonTower base block fix to re-enable support blocking.
- Change: [#15174] [Plugin] Deprecate the type "peep" and add support to target a specific scripting api version.

80
src/openrct2/world/Banner.cpp
View File

@@ -21,6 +21,7 @@
#include "../ride/RideData.h"
#include "../ride/Track.h"
#include "../windows/Intent.h"
#include "../world/TileElementsView.h"
#include "Map.h"
#include "MapAnimation.h"
#include "Park.h"
@@ -253,57 +254,50 @@ void fix_duplicated_banners()
{
// For each banner in the map, check if the banner index is in use already, and if so, create a new entry for it
std::vector<bool> activeBanners;
activeBanners.resize(MAX_BANNERS);
for (int y = 0; y < MAXIMUM_MAP_SIZE_TECHNICAL; y++)
{
for (int x = 0; x < MAXIMUM_MAP_SIZE_TECHNICAL; x++)
{
auto tileElement = map_get_first_element_at(TileCoordsXY{ x, y }.ToCoordsXY());
if (tileElement != nullptr)
const auto bannerPos = TileCoordsXY{ x, y }.ToCoordsXY();
for (auto* bannerElement : OpenRCT2::TileElementsView<BannerElement>(bannerPos))
{
do
auto bannerIndex = bannerElement->GetIndex();
if (bannerIndex == BANNER_INDEX_NULL)
continue;
if (activeBanners[bannerIndex])
{
// TODO: Handle walls and large-scenery that use banner indices too. Large scenery can be tricky, as they
// occupy multiple tiles that should both refer to the same banner index.
if (tileElement->GetType() == TILE_ELEMENT_TYPE_BANNER)
log_info(
"Duplicated banner with index %d found at x = %d, y = %d and z = %d.", bannerIndex, x, y,
bannerElement->base_height);
// Banner index is already in use by another banner, so duplicate it
auto newBanner = CreateBanner();
if (newBanner == nullptr)
{
auto bannerIndex = tileElement->AsBanner()->GetIndex();
if (bannerIndex == BANNER_INDEX_NULL)
continue;
if (activeBanners.size() <= bannerIndex)
{
activeBanners.resize(bannerIndex + 1);
}
if (activeBanners[bannerIndex])
{
log_info(
"Duplicated banner with index %d found at x = %d, y = %d and z = %d.", bannerIndex, x, y,
tileElement->base_height);
// Banner index is already in use by another banner, so duplicate it
auto newBanner = CreateBanner();
if (newBanner == nullptr)
{
log_error("Failed to create new banner.");
continue;
}
Guard::Assert(!activeBanners[newBanner->id]);
// Copy over the original banner, but update the location
auto oldBanner = GetBanner(bannerIndex);
if (oldBanner != nullptr)
{
*newBanner = *oldBanner;
newBanner->position = { x, y };
}
tileElement->AsBanner()->SetIndex(newBanner->id);
}
// Mark banner index as in-use
activeBanners[bannerIndex] = true;
log_error("Failed to create new banner.");
continue;
}
} while (!(tileElement++)->IsLastForTile());
Guard::Assert(!activeBanners[newBanner->id]);
// Copy over the original banner, but update the location
const auto* oldBanner = GetBanner(bannerIndex);
if (oldBanner != nullptr)
{
auto newBannerId = newBanner->id;
*newBanner = *oldBanner;
newBanner->id = newBannerId;
newBanner->position = { x, y };
}
bannerElement->SetIndex(newBanner->id);
}
// Mark banner index as in-use
activeBanners[bannerIndex] = true;
}
}
}