From ddacaacc713f4f55bf97061d5e0d5355c66d3cd0 Mon Sep 17 00:00:00 2001 From: Gymnasiast Date: Tue, 20 May 2025 22:57:59 +0200 Subject: [PATCH] Change SCROLLING_MODE_NONE to kScrollingModeNone --- src/openrct2-ui/interface/ViewportInteraction.cpp | 8 ++++---- src/openrct2-ui/windows/TileInspector.cpp | 2 +- src/openrct2/actions/LargeSceneryPlaceAction.cpp | 4 ++-- src/openrct2/actions/WallPlaceAction.cpp | 4 ++-- src/openrct2/object/LargeSceneryObject.cpp | 2 +- src/openrct2/object/StationObject.cpp | 2 +- src/openrct2/object/WallObject.cpp | 2 +- src/openrct2/paint/tile_element/Paint.Entrance.cpp | 4 ++-- src/openrct2/paint/tile_element/Paint.LargeScenery.cpp | 2 +- src/openrct2/paint/tile_element/Paint.Wall.cpp | 2 +- src/openrct2/rct2/S6Importer.cpp | 4 ++-- src/openrct2/scripting/bindings/world/ScTile.cpp | 2 +- src/openrct2/scripting/bindings/world/ScTileElement.cpp | 6 +++--- src/openrct2/world/Banner.cpp | 2 +- src/openrct2/world/Banner.h | 2 +- src/openrct2/world/MapAnimation.cpp | 4 ++-- src/openrct2/world/tile_element/TileElement.cpp | 4 ++-- 17 files changed, 28 insertions(+), 28 deletions(-) diff --git a/src/openrct2-ui/interface/ViewportInteraction.cpp b/src/openrct2-ui/interface/ViewportInteraction.cpp index 54fffb09a6..bbe8eec502 100644 --- a/src/openrct2-ui/interface/ViewportInteraction.cpp +++ b/src/openrct2-ui/interface/ViewportInteraction.cpp @@ -409,7 +409,7 @@ namespace OpenRCT2::Ui case ViewportInteractionItem::Wall: { auto* wallEntry = tileElement->AsWall()->GetEntry(); - if (wallEntry->scrolling_mode != SCROLLING_MODE_NONE) + if (wallEntry->scrolling_mode != kScrollingModeNone) { auto banner = tileElement->AsWall()->GetBanner(); if (banner != nullptr) @@ -428,7 +428,7 @@ namespace OpenRCT2::Ui case ViewportInteractionItem::LargeScenery: { auto* sceneryEntry = tileElement->AsLargeScenery()->GetEntry(); - if (sceneryEntry->scrolling_mode != SCROLLING_MODE_NONE) + if (sceneryEntry->scrolling_mode != kScrollingModeNone) { auto banner = tileElement->AsLargeScenery()->GetBanner(); if (banner != nullptr) @@ -693,7 +693,7 @@ namespace OpenRCT2::Ui static void ViewportInteractionRemoveParkWall(const WallElement& wallElement, const CoordsXY& mapCoords) { auto* wallEntry = wallElement.GetEntry(); - if (wallEntry->scrolling_mode != SCROLLING_MODE_NONE) + if (wallEntry->scrolling_mode != kScrollingModeNone) { ContextOpenDetailWindow(WD_SIGN_SMALL, wallElement.GetBannerIndex().ToUnderlying()); } @@ -713,7 +713,7 @@ namespace OpenRCT2::Ui { auto* sceneryEntry = largeSceneryElement.GetEntry(); - if (sceneryEntry->scrolling_mode != SCROLLING_MODE_NONE) + if (sceneryEntry->scrolling_mode != kScrollingModeNone) { auto bannerIndex = largeSceneryElement.GetBannerIndex(); ContextOpenDetailWindow(WD_SIGN, bannerIndex.ToUnderlying()); diff --git a/src/openrct2-ui/windows/TileInspector.cpp b/src/openrct2-ui/windows/TileInspector.cpp index ff4bae92be..8a3dbbd571 100644 --- a/src/openrct2-ui/windows/TileInspector.cpp +++ b/src/openrct2-ui/windows/TileInspector.cpp @@ -1515,7 +1515,7 @@ static uint64_t PageDisabledWidgets[] = { // Banner info auto* largeSceneryEntry = OpenRCT2::ObjectManager::GetObjectEntry(largeSceneryType); - if (largeSceneryEntry != nullptr && largeSceneryEntry->scrolling_mode != SCROLLING_MODE_NONE) + if (largeSceneryEntry != nullptr && largeSceneryEntry->scrolling_mode != kScrollingModeNone) { auto banner = sceneryElement->GetBanner(); if (banner != nullptr) diff --git a/src/openrct2/actions/LargeSceneryPlaceAction.cpp b/src/openrct2/actions/LargeSceneryPlaceAction.cpp index c8fd053e60..6cab4b4806 100644 --- a/src/openrct2/actions/LargeSceneryPlaceAction.cpp +++ b/src/openrct2/actions/LargeSceneryPlaceAction.cpp @@ -118,7 +118,7 @@ GameActions::Result LargeSceneryPlaceAction::Query() const res.Position.z = maxHeight; - if (sceneryEntry->scrolling_mode != SCROLLING_MODE_NONE) + if (sceneryEntry->scrolling_mode != kScrollingModeNone) { if (HasReachedBannerLimit()) { @@ -238,7 +238,7 @@ GameActions::Result LargeSceneryPlaceAction::Execute() const // Allocate banner Banner* banner = nullptr; - if (sceneryEntry->scrolling_mode != SCROLLING_MODE_NONE) + if (sceneryEntry->scrolling_mode != kScrollingModeNone) { banner = CreateBanner(); if (banner == nullptr) diff --git a/src/openrct2/actions/WallPlaceAction.cpp b/src/openrct2/actions/WallPlaceAction.cpp index 7d934de920..937f6bdc76 100644 --- a/src/openrct2/actions/WallPlaceAction.cpp +++ b/src/openrct2/actions/WallPlaceAction.cpp @@ -238,7 +238,7 @@ GameActions::Result WallPlaceAction::Query() const return GameActions::Result(GameActions::Status::InvalidParameters, STR_CANT_BUILD_THIS_HERE, STR_UNKNOWN_OBJECT_TYPE); } - if (wallEntry->scrolling_mode != SCROLLING_MODE_NONE) + if (wallEntry->scrolling_mode != kScrollingModeNone) { if (HasReachedBannerLimit()) { @@ -349,7 +349,7 @@ GameActions::Result WallPlaceAction::Execute() const } Banner* banner = nullptr; - if (wallEntry->scrolling_mode != SCROLLING_MODE_NONE) + if (wallEntry->scrolling_mode != kScrollingModeNone) { banner = CreateBanner(); if (banner == nullptr) diff --git a/src/openrct2/object/LargeSceneryObject.cpp b/src/openrct2/object/LargeSceneryObject.cpp index 8002be010c..a107b41afb 100644 --- a/src/openrct2/object/LargeSceneryObject.cpp +++ b/src/openrct2/object/LargeSceneryObject.cpp @@ -208,7 +208,7 @@ void LargeSceneryObject::ReadJson(IReadObjectContext* context, json_t& root) _legacyType.price = Json::GetNumber(properties["price"]) * 10; _legacyType.removal_price = Json::GetNumber(properties["removalPrice"]) * 10; - _legacyType.scrolling_mode = Json::GetNumber(properties["scrollingMode"], SCROLLING_MODE_NONE); + _legacyType.scrolling_mode = Json::GetNumber(properties["scrollingMode"], kScrollingModeNone); _legacyType.flags = Json::GetFlags( properties, diff --git a/src/openrct2/object/StationObject.cpp b/src/openrct2/object/StationObject.cpp index 29d3004cac..d3c2fee1be 100644 --- a/src/openrct2/object/StationObject.cpp +++ b/src/openrct2/object/StationObject.cpp @@ -87,7 +87,7 @@ void StationObject::ReadJson(IReadObjectContext* context, json_t& root) if (properties.is_object()) { Height = Json::GetNumber(properties["height"]); - ScrollingMode = Json::GetNumber(properties["scrollingMode"], SCROLLING_MODE_NONE); + ScrollingMode = Json::GetNumber(properties["scrollingMode"], kScrollingModeNone); Flags = Json::GetFlags( properties, { diff --git a/src/openrct2/object/WallObject.cpp b/src/openrct2/object/WallObject.cpp index db10cbb2a9..860698d56a 100644 --- a/src/openrct2/object/WallObject.cpp +++ b/src/openrct2/object/WallObject.cpp @@ -108,7 +108,7 @@ void WallObject::ReadJson(IReadObjectContext* context, json_t& root) _legacyType.height = Json::GetNumber(properties["height"]); _legacyType.price = Json::GetNumber(properties["price"]); - _legacyType.scrolling_mode = Json::GetNumber(properties["scrollingMode"], SCROLLING_MODE_NONE); + _legacyType.scrolling_mode = Json::GetNumber(properties["scrollingMode"], kScrollingModeNone); SetPrimarySceneryGroup(ObjectEntryDescriptor(Json::GetString(properties["sceneryGroup"]))); diff --git a/src/openrct2/paint/tile_element/Paint.Entrance.cpp b/src/openrct2/paint/tile_element/Paint.Entrance.cpp index b0a412e232..639219bf6d 100644 --- a/src/openrct2/paint/tile_element/Paint.Entrance.cpp +++ b/src/openrct2/paint/tile_element/Paint.Entrance.cpp @@ -45,7 +45,7 @@ static void PaintRideEntranceExitScrollingText( { PROFILED_FUNCTION(); - if (stationObj.ScrollingMode == SCROLLING_MODE_NONE) + if (stationObj.ScrollingMode == kScrollingModeNone) return; if (entranceEl.GetEntranceType() == ENTRANCE_TYPE_RIDE_EXIT) @@ -229,7 +229,7 @@ static void PaintParkEntranceScrollingText( return; auto scrollingMode = entrance.GetScrollingMode(); - if (scrollingMode == SCROLLING_MODE_NONE) + if (scrollingMode == kScrollingModeNone) return; auto ft = Formatter(); diff --git a/src/openrct2/paint/tile_element/Paint.LargeScenery.cpp b/src/openrct2/paint/tile_element/Paint.LargeScenery.cpp index a5eb7e293b..fd59d0ee67 100644 --- a/src/openrct2/paint/tile_element/Paint.LargeScenery.cpp +++ b/src/openrct2/paint/tile_element/Paint.LargeScenery.cpp @@ -405,7 +405,7 @@ void PaintLargeScenery(PaintSession& session, uint8_t direction, uint16_t height auto imageIndex = sceneryEntry->image + 4 + (sequenceNum << 2) + direction; PaintAddImageAsParent(session, imageTemplate.WithIndex(imageIndex), { 0, 0, height }, { bbOffset, bbLength }); - if (sceneryEntry->scrolling_mode != SCROLLING_MODE_NONE && direction != 1 && direction != 2) + if (sceneryEntry->scrolling_mode != kScrollingModeNone && direction != 1 && direction != 2) { if (sceneryEntry->flags & LARGE_SCENERY_FLAG_3D_TEXT) { diff --git a/src/openrct2/paint/tile_element/Paint.Wall.cpp b/src/openrct2/paint/tile_element/Paint.Wall.cpp index dcdd5a8e07..59cd976583 100644 --- a/src/openrct2/paint/tile_element/Paint.Wall.cpp +++ b/src/openrct2/paint/tile_element/Paint.Wall.cpp @@ -159,7 +159,7 @@ static void PaintWallScrollingText( return; auto scrollingMode = wallEntry.scrolling_mode; - if (scrollingMode == SCROLLING_MODE_NONE) + if (scrollingMode == kScrollingModeNone) return; scrollingMode = wallEntry.scrolling_mode + ((direction + 1) & 3); diff --git a/src/openrct2/rct2/S6Importer.cpp b/src/openrct2/rct2/S6Importer.cpp index 5bfbd52740..b52c53f35e 100644 --- a/src/openrct2/rct2/S6Importer.cpp +++ b/src/openrct2/rct2/S6Importer.cpp @@ -1488,7 +1488,7 @@ namespace OpenRCT2::RCT2 // Import banner information dst2->SetBannerIndex(BannerIndex::GetNull()); auto entry = dst2->GetEntry(); - if (entry != nullptr && entry->scrolling_mode != SCROLLING_MODE_NONE) + if (entry != nullptr && entry->scrolling_mode != kScrollingModeNone) { auto bannerIndex = src2->GetBannerIndex(); if (bannerIndex < std::size(_s6.Banners)) @@ -1521,7 +1521,7 @@ namespace OpenRCT2::RCT2 // Import banner information dst2->SetBannerIndex(BannerIndex::GetNull()); auto entry = dst2->GetEntry(); - if (entry != nullptr && entry->scrolling_mode != SCROLLING_MODE_NONE) + if (entry != nullptr && entry->scrolling_mode != kScrollingModeNone) { auto bannerIndex = src2->GetBannerIndex(); if (bannerIndex < std::size(_s6.Banners)) diff --git a/src/openrct2/scripting/bindings/world/ScTile.cpp b/src/openrct2/scripting/bindings/world/ScTile.cpp index 94d4892bd5..8e8e9d3729 100644 --- a/src/openrct2/scripting/bindings/world/ScTile.cpp +++ b/src/openrct2/scripting/bindings/world/ScTile.cpp @@ -197,7 +197,7 @@ namespace OpenRCT2::Scripting { auto element = &first[index]; if (element->GetType() != TileElementType::LargeScenery - || element->AsLargeScenery()->GetEntry()->scrolling_mode == SCROLLING_MODE_NONE + || element->AsLargeScenery()->GetEntry()->scrolling_mode == kScrollingModeNone || ScTileElement::GetOtherLargeSceneryElement(_coords, element->AsLargeScenery()) == nullptr) { element->RemoveBannerEntry(); diff --git a/src/openrct2/scripting/bindings/world/ScTileElement.cpp b/src/openrct2/scripting/bindings/world/ScTileElement.cpp index ae116bbe8e..1a615479b8 100644 --- a/src/openrct2/scripting/bindings/world/ScTileElement.cpp +++ b/src/openrct2/scripting/bindings/world/ScTileElement.cpp @@ -2205,7 +2205,7 @@ namespace OpenRCT2::Scripting { // check if other element still uses the banner entry if (_element->GetType() == TileElementType::LargeScenery - && _element->AsLargeScenery()->GetEntry()->scrolling_mode != SCROLLING_MODE_NONE + && _element->AsLargeScenery()->GetEntry()->scrolling_mode != kScrollingModeNone && GetOtherLargeSceneryElement(_coords, _element->AsLargeScenery()) != nullptr) return; // remove banner entry (if one exists) @@ -2222,7 +2222,7 @@ namespace OpenRCT2::Scripting case TileElementType::Wall: { auto wallEntry = _element->AsWall()->GetEntry(); - if (wallEntry == nullptr || wallEntry->scrolling_mode == SCROLLING_MODE_NONE) + if (wallEntry == nullptr || wallEntry->scrolling_mode == kScrollingModeNone) return; break; } @@ -2230,7 +2230,7 @@ namespace OpenRCT2::Scripting { auto largeScenery = _element->AsLargeScenery(); auto largeSceneryEntry = largeScenery->GetEntry(); - if (largeSceneryEntry == nullptr || largeSceneryEntry->scrolling_mode == SCROLLING_MODE_NONE) + if (largeSceneryEntry == nullptr || largeSceneryEntry->scrolling_mode == kScrollingModeNone) return; auto otherElement = GetOtherLargeSceneryElement(_coords, largeScenery); diff --git a/src/openrct2/world/Banner.cpp b/src/openrct2/world/Banner.cpp index 68d9be45c2..972d4b0db5 100644 --- a/src/openrct2/world/Banner.cpp +++ b/src/openrct2/world/Banner.cpp @@ -187,7 +187,7 @@ WallElement* BannerGetScrollingWallTileElement(BannerIndex bannerIndex) continue; auto* wallEntry = wallElement->GetEntry(); - if (wallEntry->scrolling_mode == SCROLLING_MODE_NONE) + if (wallEntry->scrolling_mode == kScrollingModeNone) continue; if (wallElement->GetBannerIndex() != bannerIndex) continue; diff --git a/src/openrct2/world/Banner.h b/src/openrct2/world/Banner.h index c2ef9e81ae..86ac4efe35 100644 --- a/src/openrct2/world/Banner.h +++ b/src/openrct2/world/Banner.h @@ -28,7 +28,7 @@ namespace OpenRCT2 constexpr ObjectEntryIndex BANNER_NULL = kObjectEntryIndexNull; constexpr size_t kMaxBanners = 8192; -constexpr uint8_t SCROLLING_MODE_NONE = 255; +constexpr uint8_t kScrollingModeNone = 255; struct Banner { diff --git a/src/openrct2/world/MapAnimation.cpp b/src/openrct2/world/MapAnimation.cpp index 323d41c992..828f7abfc6 100644 --- a/src/openrct2/world/MapAnimation.cpp +++ b/src/openrct2/world/MapAnimation.cpp @@ -567,7 +567,7 @@ static bool MapAnimationInvalidateWall(const CoordsXYZ& loc) auto* wallEntry = tileElement->AsWall()->GetEntry(); if (wallEntry == nullptr - || (!(wallEntry->flags2 & WALL_SCENERY_2_ANIMATED) && wallEntry->scrolling_mode == SCROLLING_MODE_NONE)) + || (!(wallEntry->flags2 & WALL_SCENERY_2_ANIMATED) && wallEntry->scrolling_mode == kScrollingModeNone)) continue; MapInvalidateTileZoom1({ loc, loc.z, loc.z + 16 }); @@ -639,7 +639,7 @@ void MapAnimationAutoCreateAtTileElement(TileCoordsXY coords, TileElement* el) { auto wallEl = el->AsWall(); auto* entry = wallEl->GetEntry(); - if (entry != nullptr && ((entry->flags2 & WALL_SCENERY_2_ANIMATED) || entry->scrolling_mode != SCROLLING_MODE_NONE)) + if (entry != nullptr && ((entry->flags2 & WALL_SCENERY_2_ANIMATED) || entry->scrolling_mode != kScrollingModeNone)) { MapAnimationCreate(MAP_ANIMATION_TYPE_WALL, loc); } diff --git a/src/openrct2/world/tile_element/TileElement.cpp b/src/openrct2/world/tile_element/TileElement.cpp index 144bb341f3..ac2c504643 100644 --- a/src/openrct2/world/tile_element/TileElement.cpp +++ b/src/openrct2/world/tile_element/TileElement.cpp @@ -30,7 +30,7 @@ BannerIndex TileElement::GetBannerIndex() const case TileElementType::LargeScenery: { auto* sceneryEntry = AsLargeScenery()->GetEntry(); - if (sceneryEntry == nullptr || sceneryEntry->scrolling_mode == SCROLLING_MODE_NONE) + if (sceneryEntry == nullptr || sceneryEntry->scrolling_mode == kScrollingModeNone) return BannerIndex::GetNull(); return AsLargeScenery()->GetBannerIndex(); @@ -38,7 +38,7 @@ BannerIndex TileElement::GetBannerIndex() const case TileElementType::Wall: { auto* wallEntry = AsWall()->GetEntry(); - if (wallEntry == nullptr || wallEntry->scrolling_mode == SCROLLING_MODE_NONE) + if (wallEntry == nullptr || wallEntry->scrolling_mode == kScrollingModeNone) return BannerIndex::GetNull(); return AsWall()->GetBannerIndex();