diff --git a/src/openrct2-ui/windows/EditorObjectSelection.cpp b/src/openrct2-ui/windows/EditorObjectSelection.cpp index a96101b275..675d18f10b 100644 --- a/src/openrct2-ui/windows/EditorObjectSelection.cpp +++ b/src/openrct2-ui/windows/EditorObjectSelection.cpp @@ -1200,7 +1200,7 @@ private: if (GetSelectedObjectType() == ObjectType::Ride) { auto* rideObject = reinterpret_cast(_loadedObject.get()); - const auto* rideEntry = reinterpret_cast(rideObject->GetLegacyData()); + const auto* rideEntry = reinterpret_cast(rideObject->GetLegacyData()); if (rideEntry->shop_item[0] != ShopItem::None) { std::string sells = ""; @@ -1505,7 +1505,7 @@ private: for (; ObjectEntryGetChunk(ObjectType::Ride, entry_index) == nullptr; entry_index++) ; - rct_ride_entry* ride_entry = GetRideEntryByIndex(entry_index); + RideObjectEntry* ride_entry = GetRideEntryByIndex(entry_index); auto rideType = ride_entry->GetFirstNonNullRideType(); auto intent = Intent(WindowClass::TrackDesignList); @@ -1586,7 +1586,7 @@ void EditorLoadSelectedObjects() auto entryIndex = ObjectManagerGetLoadedObjectEntryIndex(loadedObject); if (objectType == ObjectType::Ride) { - rct_ride_entry* rideEntry = GetRideEntryByIndex(entryIndex); + RideObjectEntry* rideEntry = GetRideEntryByIndex(entryIndex); auto rideType = rideEntry->GetFirstNonNullRideType(); ResearchCategory category = static_cast(GetRideTypeDescriptor(rideType).Category); ResearchInsertRideEntry(rideType, entryIndex, category, true); diff --git a/src/openrct2-ui/windows/NewRide.cpp b/src/openrct2-ui/windows/NewRide.cpp index 8cc5c94c3f..f6afe838e4 100644 --- a/src/openrct2-ui/windows/NewRide.cpp +++ b/src/openrct2-ui/windows/NewRide.cpp @@ -643,7 +643,7 @@ private: continue; // Ride entries - rct_ride_entry* rideEntry = GetRideEntryByIndex(rideEntryIndex); + RideObjectEntry* rideEntry = GetRideEntryByIndex(rideEntryIndex); // Skip if the vehicle isn't the preferred vehicle for this generic track type if (!gConfigInterface.ListRideVehiclesSeparately @@ -824,7 +824,7 @@ private: void DrawRideInformation(DrawPixelInfo& dpi, RideSelection item, const ScreenCoordsXY& screenPos, int32_t textWidth) { - rct_ride_entry* rideEntry = GetRideEntryByIndex(item.EntryIndex); + RideObjectEntry* rideEntry = GetRideEntryByIndex(item.EntryIndex); RideNaming rideNaming = GetRideNaming(item.Type, *rideEntry); auto ft = Formatter(); @@ -982,7 +982,7 @@ void WindowNewRideFocus(RideSelection rideItem) return; } - rct_ride_entry* rideEntry = GetRideEntryByIndex(rideItem.EntryIndex); + RideObjectEntry* rideEntry = GetRideEntryByIndex(rideItem.EntryIndex); if (rideEntry == nullptr) return; diff --git a/src/openrct2-ui/windows/Ride.cpp b/src/openrct2-ui/windows/Ride.cpp index 4219018a84..8e0fc06d34 100644 --- a/src/openrct2-ui/windows/Ride.cpp +++ b/src/openrct2-ui/windows/Ride.cpp @@ -858,7 +858,7 @@ struct VehicleTypeLabel }; static int32_t VehicleDropdownDataLanguage = LANGUAGE_UNDEFINED; -static rct_ride_entry* VehicleDropdownRideType = nullptr; +static RideObjectEntry* VehicleDropdownRideType = nullptr; static bool VehicleDropdownExpanded = false; static std::vector VehicleDropdownData; @@ -1073,7 +1073,7 @@ static void WindowRideDisableTabs(rct_window* w) if ((gScreenFlags & SCREEN_FLAGS_TRACK_DESIGNER) != 0) disabled_tabs |= (1uLL << WIDX_TAB_4 | 1uLL << WIDX_TAB_6 | 1uLL << WIDX_TAB_9 | 1uLL << WIDX_TAB_10); // 0x3280 - rct_ride_entry* rideEntry = GetRideEntryByIndex(ride->subtype); + RideObjectEntry* rideEntry = GetRideEntryByIndex(ride->subtype); if (rideEntry == nullptr) { @@ -1516,7 +1516,7 @@ static void WindowRideInitViewport(rct_window* w) if (viewSelectionIndex >= 0 && viewSelectionIndex < ride->NumTrains && ride->lifecycle_flags & RIDE_LIFECYCLE_ON_TRACK) { auto vehId = ride->vehicles[viewSelectionIndex]; - rct_ride_entry* ride_entry = ride->GetRideEntry(); + RideObjectEntry* ride_entry = ride->GetRideEntry(); if (ride_entry != nullptr && ride_entry->TabCar != 0) { Vehicle* vehicle = GetEntity(vehId); @@ -1989,7 +1989,7 @@ static void WindowRideMainFollowRide(rct_window* w) static void PopulateVehicleTypeDropdown(const Ride& ride, bool forceRefresh) { auto& objManager = GetContext()->GetObjectManager(); - rct_ride_entry* rideEntry = ride.GetRideEntry(); + RideObjectEntry* rideEntry = ride.GetRideEntry(); bool selectionShouldBeExpanded; int32_t rideTypeIterator, rideTypeIteratorMax; @@ -2777,7 +2777,7 @@ static OpenRCT2String WindowRideVehicleTooltip(rct_window* const w, const Widget static void WindowRideVehicleInvalidate(rct_window* w) { Widget* widgets; - rct_ride_entry* rideEntry; + RideObjectEntry* rideEntry; StringId stringId; int32_t carsPerTrain; @@ -2949,7 +2949,7 @@ static void WindowRideVehicleScrollpaint(rct_window* w, DrawPixelInfo* dpi, int3 if (ride == nullptr) return; - rct_ride_entry* rideEntry = ride->GetRideEntry(); + RideObjectEntry* rideEntry = ride->GetRideEntry(); // Background GfxFillRect(dpi, { { dpi->x, dpi->y }, { dpi->x + dpi->width, dpi->y + dpi->height } }, PALETTE_INDEX_12); diff --git a/src/openrct2-ui/windows/RideConstruction.cpp b/src/openrct2-ui/windows/RideConstruction.cpp index 4751514174..c04297c8d7 100644 --- a/src/openrct2-ui/windows/RideConstruction.cpp +++ b/src/openrct2-ui/windows/RideConstruction.cpp @@ -2291,7 +2291,7 @@ private: int32_t direction; TileElement* tileElement; CoordsXYE inputElement, outputElement; - track_begin_end trackBeginEnd; + TrackBeginEnd trackBeginEnd; _currentTrackPrice = MONEY32_UNDEFINED; RideConstructionInvalidateCurrentTrack(); @@ -2889,7 +2889,7 @@ static void RideConstructPlacedBackwardGameActionCallback(const GameAction* ga, trackPos += CoordsDirectionDelta[trackDirection]; } - track_begin_end trackBeginEnd; + TrackBeginEnd trackBeginEnd; if (TrackBlockGetPreviousFromZero(trackPos, *ride, trackDirection, &trackBeginEnd)) { _currentTrackBegin.x = trackBeginEnd.begin_x; diff --git a/src/openrct2-ui/windows/Scenery.cpp b/src/openrct2-ui/windows/Scenery.cpp index 9900f56565..bdecd27989 100644 --- a/src/openrct2-ui/windows/Scenery.cpp +++ b/src/openrct2-ui/windows/Scenery.cpp @@ -118,7 +118,7 @@ private: } } - const rct_scenery_group_entry* GetSceneryGroupEntry() const + const SceneryGroupEntry* GetSceneryGroupEntry() const { return ::GetSceneryGroupEntry(SceneryGroupIndex); } diff --git a/src/openrct2-ui/windows/TopToolbar.cpp b/src/openrct2-ui/windows/TopToolbar.cpp index 28639203b6..c955541d3d 100644 --- a/src/openrct2-ui/windows/TopToolbar.cpp +++ b/src/openrct2-ui/windows/TopToolbar.cpp @@ -2810,7 +2810,7 @@ static void TopToolbarToolUpdateScenery(const ScreenCoordsXY& screenPos) auto* sceneryEntry = GetLargeSceneryEntry(selection.EntryIndex); gMapSelectionTiles.clear(); - for (rct_large_scenery_tile* tile = sceneryEntry->tiles; + for (LargeSceneryTile* tile = sceneryEntry->tiles; tile->x_offset != static_cast(static_cast(0xFFFF)); tile++) { CoordsXY tileLocation = { tile->x_offset, tile->y_offset }; diff --git a/src/openrct2-ui/windows/TrackList.cpp b/src/openrct2-ui/windows/TrackList.cpp index c9b2a84eb3..fbb1783021 100644 --- a/src/openrct2-ui/windows/TrackList.cpp +++ b/src/openrct2-ui/windows/TrackList.cpp @@ -362,7 +362,7 @@ public: void OnPrepareDraw() override { StringId stringId = STR_NONE; - rct_ride_entry* entry = GetRideEntryByIndex(_window_track_list_item.EntryIndex); + RideObjectEntry* entry = GetRideEntryByIndex(_window_track_list_item.EntryIndex); if (entry != nullptr) { diff --git a/src/openrct2/actions/LandSetHeightAction.cpp b/src/openrct2/actions/LandSetHeightAction.cpp index acd8caddb8..9ab3d59da1 100644 --- a/src/openrct2/actions/LandSetHeightAction.cpp +++ b/src/openrct2/actions/LandSetHeightAction.cpp @@ -278,7 +278,7 @@ StringId LandSetHeightAction::CheckRideSupports() const if (ride == nullptr) continue; - rct_ride_entry* rideEntry = ride->GetRideEntry(); + RideObjectEntry* rideEntry = ride->GetRideEntry(); if (rideEntry == nullptr) continue; diff --git a/src/openrct2/actions/LargeSceneryPlaceAction.cpp b/src/openrct2/actions/LargeSceneryPlaceAction.cpp index 4920ab5afa..1d7bda2de3 100644 --- a/src/openrct2/actions/LargeSceneryPlaceAction.cpp +++ b/src/openrct2/actions/LargeSceneryPlaceAction.cpp @@ -107,7 +107,7 @@ GameActions::Result LargeSceneryPlaceAction::Query() const } uint8_t tileNum = 0; - for (rct_large_scenery_tile* tile = sceneryEntry->tiles; tile->x_offset != -1; tile++, tileNum++) + for (LargeSceneryTile* tile = sceneryEntry->tiles; tile->x_offset != -1; tile++, tileNum++) { auto curTile = CoordsXY{ tile->x_offset, tile->y_offset }.Rotate(_loc.direction); @@ -243,7 +243,7 @@ GameActions::Result LargeSceneryPlaceAction::Execute() const } uint8_t tileNum = 0; - for (rct_large_scenery_tile* tile = sceneryEntry->tiles; tile->x_offset != -1; tile++, tileNum++) + for (LargeSceneryTile* tile = sceneryEntry->tiles; tile->x_offset != -1; tile++, tileNum++) { auto curTile = CoordsXY{ tile->x_offset, tile->y_offset }.Rotate(_loc.direction); @@ -310,19 +310,19 @@ GameActions::Result LargeSceneryPlaceAction::Execute() const return res; } -int16_t LargeSceneryPlaceAction::GetTotalNumTiles(rct_large_scenery_tile* tiles) const +int16_t LargeSceneryPlaceAction::GetTotalNumTiles(LargeSceneryTile* tiles) const { uint32_t totalNumTiles = 0; - for (rct_large_scenery_tile* tile = tiles; tile->x_offset != -1; tile++) + for (LargeSceneryTile* tile = tiles; tile->x_offset != -1; tile++) { totalNumTiles++; } return totalNumTiles; } -bool LargeSceneryPlaceAction::CheckMapCapacity(rct_large_scenery_tile* tiles, int16_t numTiles) const +bool LargeSceneryPlaceAction::CheckMapCapacity(LargeSceneryTile* tiles, int16_t numTiles) const { - for (rct_large_scenery_tile* tile = tiles; tile->x_offset != -1; tile++) + for (LargeSceneryTile* tile = tiles; tile->x_offset != -1; tile++) { auto curTile = CoordsXY{ tile->x_offset, tile->y_offset }.Rotate(_loc.direction); @@ -336,10 +336,10 @@ bool LargeSceneryPlaceAction::CheckMapCapacity(rct_large_scenery_tile* tiles, in return true; } -int16_t LargeSceneryPlaceAction::GetMaxSurfaceHeight(rct_large_scenery_tile* tiles) const +int16_t LargeSceneryPlaceAction::GetMaxSurfaceHeight(LargeSceneryTile* tiles) const { int16_t maxHeight = -1; - for (rct_large_scenery_tile* tile = tiles; tile->x_offset != -1; tile++) + for (LargeSceneryTile* tile = tiles; tile->x_offset != -1; tile++) { auto curTile = CoordsXY{ tile->x_offset, tile->y_offset }.Rotate(_loc.direction); diff --git a/src/openrct2/actions/LargeSceneryPlaceAction.h b/src/openrct2/actions/LargeSceneryPlaceAction.h index 2987aac104..23e23317be 100644 --- a/src/openrct2/actions/LargeSceneryPlaceAction.h +++ b/src/openrct2/actions/LargeSceneryPlaceAction.h @@ -45,8 +45,8 @@ public: GameActions::Result Execute() const override; private: - int16_t GetTotalNumTiles(rct_large_scenery_tile* tiles) const; - bool CheckMapCapacity(rct_large_scenery_tile* tiles, int16_t numTiles) const; - int16_t GetMaxSurfaceHeight(rct_large_scenery_tile* tiles) const; + int16_t GetTotalNumTiles(LargeSceneryTile* tiles) const; + bool CheckMapCapacity(LargeSceneryTile* tiles, int16_t numTiles) const; + int16_t GetMaxSurfaceHeight(LargeSceneryTile* tiles) const; void SetNewLargeSceneryElement(LargeSceneryElement& sceneryElement, uint8_t tileNum) const; }; diff --git a/src/openrct2/actions/RideCreateAction.cpp b/src/openrct2/actions/RideCreateAction.cpp index ae026e561a..9f5c2776ef 100644 --- a/src/openrct2/actions/RideCreateAction.cpp +++ b/src/openrct2/actions/RideCreateAction.cpp @@ -97,13 +97,13 @@ GameActions::Result RideCreateAction::Query() const return GameActions::Result(GameActions::Status::InvalidParameters, STR_CANT_CREATE_NEW_RIDE_ATTRACTION, STR_NONE); } - rct_ride_entry* rideEntry = GetRideEntryByIndex(rideEntryIndex); + RideObjectEntry* rideEntry = GetRideEntryByIndex(rideEntryIndex); if (rideEntry == nullptr) { return GameActions::Result(GameActions::Status::InvalidParameters, STR_CANT_CREATE_NEW_RIDE_ATTRACTION, STR_NONE); } - vehicle_colour_preset_list* presetList = rideEntry->vehicle_preset_list; + VehicleColourPresetList* presetList = rideEntry->vehicle_preset_list; if ((presetList->count > 0 && presetList->count != 255) && _colour2 >= presetList->count) { return GameActions::Result(GameActions::Status::InvalidParameters, STR_CANT_CREATE_NEW_RIDE_ATTRACTION, STR_NONE); @@ -117,7 +117,7 @@ GameActions::Result RideCreateAction::Query() const GameActions::Result RideCreateAction::Execute() const { - rct_ride_entry* rideEntry; + RideObjectEntry* rideEntry; auto res = GameActions::Result(); int32_t rideEntryIndex = RideGetEntryIndex(_rideType, _subType); diff --git a/src/openrct2/actions/RideSetPriceAction.cpp b/src/openrct2/actions/RideSetPriceAction.cpp index a8d257f66e..562632c939 100644 --- a/src/openrct2/actions/RideSetPriceAction.cpp +++ b/src/openrct2/actions/RideSetPriceAction.cpp @@ -58,7 +58,7 @@ GameActions::Result RideSetPriceAction::Query() const return GameActions::Result(GameActions::Status::InvalidParameters, STR_NONE, STR_NONE); } - rct_ride_entry* rideEntry = GetRideEntryByIndex(ride->subtype); + RideObjectEntry* rideEntry = GetRideEntryByIndex(ride->subtype); if (rideEntry == nullptr) { LOG_WARNING("Invalid game command for ride %u", _rideIndex.ToUnderlying()); @@ -80,7 +80,7 @@ GameActions::Result RideSetPriceAction::Execute() const return GameActions::Result(GameActions::Status::InvalidParameters, STR_NONE, STR_NONE); } - rct_ride_entry* rideEntry = GetRideEntryByIndex(ride->subtype); + RideObjectEntry* rideEntry = GetRideEntryByIndex(ride->subtype); if (rideEntry == nullptr) { LOG_WARNING("Invalid game command for ride %u", _rideIndex.ToUnderlying()); diff --git a/src/openrct2/actions/RideSetVehicleAction.cpp b/src/openrct2/actions/RideSetVehicleAction.cpp index 92e2cd6a71..5aa0875270 100644 --- a/src/openrct2/actions/RideSetVehicleAction.cpp +++ b/src/openrct2/actions/RideSetVehicleAction.cpp @@ -103,7 +103,7 @@ GameActions::Result RideSetVehicleAction::Query() const } // Validate preset - vehicle_colour_preset_list* presetList = rideEntry->vehicle_preset_list; + VehicleColourPresetList* presetList = rideEntry->vehicle_preset_list; if (_colour >= presetList->count && _colour != 255 && _colour != 0) { LOG_ERROR("Unknown vehicle colour preset. colour = %d", _colour); diff --git a/src/openrct2/actions/TrackPlaceAction.cpp b/src/openrct2/actions/TrackPlaceAction.cpp index 5fda1b4064..9aef605124 100644 --- a/src/openrct2/actions/TrackPlaceAction.cpp +++ b/src/openrct2/actions/TrackPlaceAction.cpp @@ -74,7 +74,7 @@ GameActions::Result TrackPlaceAction::Query() const return GameActions::Result( GameActions::Status::InvalidParameters, STR_RIDE_CONSTRUCTION_CANT_CONSTRUCT_THIS_HERE, STR_NONE); } - rct_ride_entry* rideEntry = GetRideEntryByIndex(ride->subtype); + RideObjectEntry* rideEntry = GetRideEntryByIndex(ride->subtype); if (rideEntry == nullptr) { LOG_WARNING("Invalid ride subtype for track placement, rideIndex = %d", _rideIndex.ToUnderlying()); @@ -417,7 +417,7 @@ GameActions::Result TrackPlaceAction::Execute() const GameActions::Status::InvalidParameters, STR_RIDE_CONSTRUCTION_CANT_CONSTRUCT_THIS_HERE, STR_NONE); } - rct_ride_entry* rideEntry = GetRideEntryByIndex(ride->subtype); + RideObjectEntry* rideEntry = GetRideEntryByIndex(ride->subtype); if (rideEntry == nullptr) { LOG_WARNING("Invalid ride subtype for track placement, rideIndex = %d", _rideIndex.ToUnderlying()); diff --git a/src/openrct2/actions/WallPlaceAction.cpp b/src/openrct2/actions/WallPlaceAction.cpp index a036f401a1..8894f3bee0 100644 --- a/src/openrct2/actions/WallPlaceAction.cpp +++ b/src/openrct2/actions/WallPlaceAction.cpp @@ -551,7 +551,7 @@ GameActions::Result WallPlaceAction::WallCheckObstruction( break; auto sequence = largeSceneryElement->GetSequenceIndex(); - const rct_large_scenery_tile& tile = sceneryEntry->tiles[sequence]; + const LargeSceneryTile& tile = sceneryEntry->tiles[sequence]; int32_t direction = ((_edge - tileElement->GetDirection()) & TILE_ELEMENT_DIRECTION_MASK) + 8; if (!(tile.flags & (1 << direction))) diff --git a/src/openrct2/drawing/ScrollingText.cpp b/src/openrct2/drawing/ScrollingText.cpp index e163e78395..e8d53944b9 100644 --- a/src/openrct2/drawing/ScrollingText.cpp +++ b/src/openrct2/drawing/ScrollingText.cpp @@ -26,7 +26,7 @@ using namespace OpenRCT2; -struct rct_draw_scroll_text +struct DrawScrollText { StringId string_id; uint8_t string_args[32]; @@ -37,7 +37,7 @@ struct rct_draw_scroll_text uint8_t bitmap[64 * 40]; }; -static rct_draw_scroll_text _drawScrollTextList[OpenRCT2::MaxScrollingTextEntries]; +static DrawScrollText _drawScrollTextList[OpenRCT2::MaxScrollingTextEntries]; static uint8_t _characterBitmaps[FONT_SPRITE_GLYPH_COUNT + SPR_G2_GLYPH_COUNT][8]; static uint32_t _drawSCrollNextIndex = 0; static std::mutex _scrollingTextMutex; @@ -127,7 +127,7 @@ static int32_t ScrollingTextGetMatchingOrOldest( int32_t scrollIndex = -1; for (size_t i = 0; i < std::size(_drawScrollTextList); i++) { - rct_draw_scroll_text* scrollText = &_drawScrollTextList[i]; + DrawScrollText* scrollText = &_drawScrollTextList[i]; if (oldestId >= scrollText->id) { oldestId = scrollText->id; @@ -146,7 +146,7 @@ static int32_t ScrollingTextGetMatchingOrOldest( return scrollIndex; } -static void ScrollingTextFormat(utf8* dst, size_t size, rct_draw_scroll_text* scrollText) +static void ScrollingTextFormat(utf8* dst, size_t size, DrawScrollText* scrollText) { if (gConfigGeneral.UpperCaseBanners) { diff --git a/src/openrct2/entity/Guest.cpp b/src/openrct2/entity/Guest.cpp index c6426766a1..7d27d60847 100644 --- a/src/openrct2/entity/Guest.cpp +++ b/src/openrct2/entity/Guest.cpp @@ -2500,7 +2500,7 @@ void Guest::GoToRideEntrance(const Ride& ride) int16_t y_shift = DirectionOffsets[location.direction].y; uint8_t shift_multiplier = 21; - rct_ride_entry* rideEntry = GetRideEntryByIndex(ride.subtype); + RideObjectEntry* rideEntry = GetRideEntryByIndex(ride.subtype); if (rideEntry != nullptr) { if (rideEntry->Cars[rideEntry->DefaultCar].flags & CAR_ENTRY_FLAG_MINI_GOLF @@ -3383,7 +3383,7 @@ void Guest::UpdateBuying() } else { - rct_ride_entry* ride_type = GetRideEntryByIndex(ride->subtype); + RideObjectEntry* ride_type = GetRideEntryByIndex(ride->subtype); if (ride_type == nullptr) { return; @@ -3786,7 +3786,7 @@ static void PeepGoToRideExit(Peep* peep, const Ride& ride, int16_t x, int16_t y, int16_t shift_multiplier = 20; - rct_ride_entry* rideEntry = GetRideEntryByIndex(ride.subtype); + RideObjectEntry* rideEntry = GetRideEntryByIndex(ride.subtype); if (rideEntry != nullptr) { CarEntry* carEntry = &rideEntry->Cars[rideEntry->DefaultCar]; @@ -3927,7 +3927,7 @@ void Guest::UpdateRideFreeVehicleCheck() if (vehicle == nullptr) return; - rct_ride_entry* ride_entry = vehicle->GetRideEntry(); + RideObjectEntry* ride_entry = vehicle->GetRideEntry(); if (ride_entry == nullptr) { return; @@ -4120,7 +4120,7 @@ void Guest::UpdateRideLeaveVehicle() ride_station = bestStationIndex; } CurrentRideStation = ride_station; - rct_ride_entry* rideEntry = vehicle->GetRideEntry(); + RideObjectEntry* rideEntry = vehicle->GetRideEntry(); if (rideEntry == nullptr) { return; @@ -4299,7 +4299,7 @@ void Guest::UpdateRidePrepareForExit() int16_t shiftMultiplier = 20; - rct_ride_entry* rideEntry = ride->GetRideEntry(); + RideObjectEntry* rideEntry = ride->GetRideEntry(); if (rideEntry != nullptr) { CarEntry* carEntry = &rideEntry->Cars[rideEntry->DefaultCar]; @@ -4421,7 +4421,7 @@ void Guest::UpdateRideApproachVehicleWaypoints() CoordsXY targetLoc = rtd.GetGuestWaypointLocation(*vehicle, *ride, CurrentRideStation); - rct_ride_entry* ride_entry = vehicle->GetRideEntry(); + RideObjectEntry* ride_entry = vehicle->GetRideEntry(); if (ride_entry == nullptr) { return; @@ -4516,7 +4516,7 @@ void Guest::UpdateRideApproachExitWaypoints() const auto& rtd = ride->GetRideTypeDescriptor(); CoordsXY targetLoc = rtd.GetGuestWaypointLocation(*vehicle, *ride, CurrentRideStation); - rct_ride_entry* rideEntry = vehicle->GetRideEntry(); + RideObjectEntry* rideEntry = vehicle->GetRideEntry(); CarEntry* carEntry = &rideEntry->Cars[vehicle->vehicle_type]; Guard::Assert((Var37 & 3) < 3); diff --git a/src/openrct2/entity/Staff.cpp b/src/openrct2/entity/Staff.cpp index ecfe3f5f5b..8798a60051 100644 --- a/src/openrct2/entity/Staff.cpp +++ b/src/openrct2/entity/Staff.cpp @@ -2306,7 +2306,7 @@ bool Staff::UpdateFixingMoveToStationStart(bool firstRun, const Ride& ride) } Direction stationDirection = 0; - track_begin_end trackBeginEnd; + TrackBeginEnd trackBeginEnd; while (TrackBlockGetPrevious(input, &trackBeginEnd)) { if (trackBeginEnd.begin_element->AsTrack()->IsStation()) diff --git a/src/openrct2/interface/InteractiveConsole.cpp b/src/openrct2/interface/InteractiveConsole.cpp index 39e5018818..4003efadc4 100644 --- a/src/openrct2/interface/InteractiveConsole.cpp +++ b/src/openrct2/interface/InteractiveConsole.cpp @@ -1233,7 +1233,7 @@ static int32_t ConsoleCommandLoadObject(InteractiveConsole& console, const argum if (objectType == ObjectType::Ride) { // Automatically research the ride so it's supported by the game. - rct_ride_entry* rideEntry; + RideObjectEntry* rideEntry; rideEntry = GetRideEntryByIndex(groupIndex); diff --git a/src/openrct2/management/Research.cpp b/src/openrct2/management/Research.cpp index ae0a3a12d7..568bc1e42f 100644 --- a/src/openrct2/management/Research.cpp +++ b/src/openrct2/management/Research.cpp @@ -201,7 +201,7 @@ void ResearchFinishItem(ResearchItem* researchItem) // Ride auto base_ride_type = researchItem->baseRideType; ObjectEntryIndex rideEntryIndex = researchItem->entryIndex; - rct_ride_entry* rideEntry = GetRideEntryByIndex(rideEntryIndex); + RideObjectEntry* rideEntry = GetRideEntryByIndex(rideEntryIndex); if (rideEntry != nullptr && base_ride_type != RIDE_TYPE_NULL) { @@ -233,7 +233,7 @@ void ResearchFinishItem(ResearchItem* researchItem) { if (!seenRideEntry[i]) { - rct_ride_entry* rideEntry2 = GetRideEntryByIndex(i); + RideObjectEntry* rideEntry2 = GetRideEntryByIndex(i); if (rideEntry2 != nullptr) { for (uint8_t j = 0; j < RCT2::ObjectLimits::MaxRideTypesPerRideEntry; j++) @@ -284,7 +284,7 @@ void ResearchFinishItem(ResearchItem* researchItem) else { // Scenery - rct_scenery_group_entry* sceneryGroupEntry = GetSceneryGroupEntry(researchItem->entryIndex); + SceneryGroupEntry* sceneryGroupEntry = GetSceneryGroupEntry(researchItem->entryIndex); if (sceneryGroupEntry != nullptr) { SceneryGroupSetInvented(researchItem->entryIndex); @@ -474,7 +474,7 @@ void ResearchPopulateListRandom() // Rides for (int32_t i = 0; i < MAX_RIDE_OBJECTS; i++) { - rct_ride_entry* rideEntry = GetRideEntryByIndex(i); + RideObjectEntry* rideEntry = GetRideEntryByIndex(i); if (rideEntry == nullptr) { continue; @@ -494,7 +494,7 @@ void ResearchPopulateListRandom() // Scenery for (uint32_t i = 0; i < MAX_SCENERY_GROUP_OBJECTS; i++) { - rct_scenery_group_entry* sceneryGroupEntry = GetSceneryGroupEntry(i); + SceneryGroupEntry* sceneryGroupEntry = GetSceneryGroupEntry(i); if (sceneryGroupEntry == nullptr) { continue; @@ -519,7 +519,7 @@ bool ResearchInsertRideEntry(ride_type_t rideType, ObjectEntryIndex entryIndex, void ResearchInsertRideEntry(ObjectEntryIndex entryIndex, bool researched) { - rct_ride_entry* rideEntry = GetRideEntryByIndex(entryIndex); + RideObjectEntry* rideEntry = GetRideEntryByIndex(entryIndex); if (rideEntry == nullptr) return; @@ -649,7 +649,7 @@ void SetAllSceneryGroupsNotInvented() { for (int32_t i = 0; i < MAX_SCENERY_GROUP_OBJECTS; ++i) { - rct_scenery_group_entry* scenery_set = GetSceneryGroupEntry(i); + SceneryGroupEntry* scenery_set = GetSceneryGroupEntry(i); if (scenery_set == nullptr) { continue; @@ -706,7 +706,7 @@ StringId ResearchItem::GetName() const { if (type == Research::EntryType::Ride) { - rct_ride_entry* rideEntry = GetRideEntryByIndex(entryIndex); + RideObjectEntry* rideEntry = GetRideEntryByIndex(entryIndex); if (rideEntry == nullptr) { return STR_EMPTY; @@ -715,7 +715,7 @@ StringId ResearchItem::GetName() const return rideEntry->naming.Name; } - rct_scenery_group_entry* sceneryEntry = GetSceneryGroupEntry(entryIndex); + SceneryGroupEntry* sceneryEntry = GetSceneryGroupEntry(entryIndex); if (sceneryEntry == nullptr) { return STR_EMPTY; diff --git a/src/openrct2/management/Research.h b/src/openrct2/management/Research.h index a166202885..214c7190cc 100644 --- a/src/openrct2/management/Research.h +++ b/src/openrct2/management/Research.h @@ -16,7 +16,7 @@ #include -struct rct_ride_entry; +struct RideObjectEntry; struct ScenerySelection; namespace Research diff --git a/src/openrct2/object/LargeSceneryObject.cpp b/src/openrct2/object/LargeSceneryObject.cpp index 11cd67edc7..efe0fcdae6 100644 --- a/src/openrct2/object/LargeSceneryObject.cpp +++ b/src/openrct2/object/LargeSceneryObject.cpp @@ -24,9 +24,9 @@ #include #include -static rct_large_scenery_text ReadLegacy3DFont(OpenRCT2::IStream& stream) +static RCTLargeSceneryText ReadLegacy3DFont(OpenRCT2::IStream& stream) { - rct_large_scenery_text _3dFontLegacy = {}; + RCTLargeSceneryText _3dFontLegacy = {}; _3dFontLegacy.offset[0].x = stream.ReadValue(); _3dFontLegacy.offset[0].y = stream.ReadValue(); _3dFontLegacy.offset[1].x = stream.ReadValue(); @@ -37,7 +37,7 @@ static rct_large_scenery_text ReadLegacy3DFont(OpenRCT2::IStream& stream) _3dFontLegacy.num_images = stream.ReadValue(); auto ReadLegacyTextGlyph = [&stream]() { - rct_large_scenery_text_glyph glyph{}; + LargeSceneryTextGlyph glyph{}; glyph.image_offset = stream.ReadValue(); glyph.width = stream.ReadValue(); glyph.height = stream.ReadValue(); @@ -71,7 +71,7 @@ void LargeSceneryObject::ReadLegacy(IReadObjectContext* context, OpenRCT2::IStre if (_legacyType.flags & LARGE_SCENERY_FLAG_3D_TEXT) { - rct_large_scenery_text _3dFontLegacy = ReadLegacy3DFont(*stream); + RCTLargeSceneryText _3dFontLegacy = ReadLegacy3DFont(*stream); _3dFont = std::make_unique(_3dFontLegacy); _legacyType.text = _3dFont.get(); } @@ -153,12 +153,12 @@ void LargeSceneryObject::DrawPreview(DrawPixelInfo* dpi, int32_t width, int32_t GfxDrawSprite(dpi, image, screenCoords); } -std::vector LargeSceneryObject::ReadTiles(OpenRCT2::IStream* stream) +std::vector LargeSceneryObject::ReadTiles(OpenRCT2::IStream* stream) { - auto tiles = std::vector(); + auto tiles = std::vector(); auto ReadLegacyTile = [&stream]() { - rct_large_scenery_tile tile{}; + LargeSceneryTile tile{}; tile.x_offset = stream->ReadValue(); tile.y_offset = stream->ReadValue(); tile.z_offset = stream->ReadValue(); @@ -223,15 +223,15 @@ void LargeSceneryObject::ReadJson(IReadObjectContext* context, json_t& root) PopulateTablesFromJson(context, root); } -std::vector LargeSceneryObject::ReadJsonTiles(json_t& jTiles) +std::vector LargeSceneryObject::ReadJsonTiles(json_t& jTiles) { - std::vector tiles; + std::vector tiles; for (auto& jTile : jTiles) { if (jTile.is_object()) { - rct_large_scenery_tile tile = {}; + LargeSceneryTile tile = {}; tile.x_offset = Json::GetNumber(jTile["x"]); tile.y_offset = Json::GetNumber(jTile["y"]); tile.z_offset = Json::GetNumber(jTile["z"]); @@ -315,14 +315,14 @@ std::vector LargeSceneryObject::ReadJsonOffsets(json_t& jOffsets) return offsets; } -std::vector LargeSceneryObject::ReadJsonGlyphs(json_t& jGlyphs) +std::vector LargeSceneryObject::ReadJsonGlyphs(json_t& jGlyphs) { - std::vector glyphs; + std::vector glyphs; for (auto& jGlyph : jGlyphs) { if (jGlyph.is_object()) { - rct_large_scenery_text_glyph glyph = {}; + LargeSceneryTextGlyph glyph = {}; glyph.image_offset = Json::GetNumber(jGlyph["image"]); glyph.width = Json::GetNumber(jGlyph["width"]); glyph.height = Json::GetNumber(jGlyph["height"]); @@ -332,7 +332,7 @@ std::vector LargeSceneryObject::ReadJsonGlyphs(jso return glyphs; } -const rct_large_scenery_tile* LargeSceneryObject::GetTileForSequence(uint8_t SequenceIndex) const +const LargeSceneryTile* LargeSceneryObject::GetTileForSequence(uint8_t SequenceIndex) const { if (SequenceIndex >= _tiles.size()) return nullptr; diff --git a/src/openrct2/object/LargeSceneryObject.h b/src/openrct2/object/LargeSceneryObject.h index 0e5bc07cd1..d93ff9a026 100644 --- a/src/openrct2/object/LargeSceneryObject.h +++ b/src/openrct2/object/LargeSceneryObject.h @@ -20,7 +20,7 @@ class LargeSceneryObject final : public SceneryObject private: LargeSceneryEntry _legacyType = {}; uint32_t _baseImageId = 0; - std::vector _tiles; + std::vector _tiles; std::unique_ptr _3dFont; public: @@ -35,12 +35,12 @@ public: void Unload() override; void DrawPreview(DrawPixelInfo* dpi, int32_t width, int32_t height) const override; - const rct_large_scenery_tile* GetTileForSequence(uint8_t SequenceIndex) const; + const LargeSceneryTile* GetTileForSequence(uint8_t SequenceIndex) const; private: - [[nodiscard]] static std::vector ReadTiles(OpenRCT2::IStream* stream); - [[nodiscard]] static std::vector ReadJsonTiles(json_t& jTiles); + [[nodiscard]] static std::vector ReadTiles(OpenRCT2::IStream* stream); + [[nodiscard]] static std::vector ReadJsonTiles(json_t& jTiles); [[nodiscard]] static std::unique_ptr ReadJson3dFont(json_t& j3dFont); [[nodiscard]] static std::vector ReadJsonOffsets(json_t& jOffsets); - [[nodiscard]] static std::vector ReadJsonGlyphs(json_t& jGlyphs); + [[nodiscard]] static std::vector ReadJsonGlyphs(json_t& jGlyphs); }; diff --git a/src/openrct2/object/ObjectManager.cpp b/src/openrct2/object/ObjectManager.cpp index 1dff0e7ffb..b1ed94e6c3 100644 --- a/src/openrct2/object/ObjectManager.cpp +++ b/src/openrct2/object/ObjectManager.cpp @@ -701,7 +701,7 @@ private: if (rideObject == nullptr) continue; - const auto* entry = static_cast(rideObject->GetLegacyData()); + const auto* entry = static_cast(rideObject->GetLegacyData()); if (entry == nullptr) continue; diff --git a/src/openrct2/object/ObjectRepository.cpp b/src/openrct2/object/ObjectRepository.cpp index 289e4b922a..181304caf7 100644 --- a/src/openrct2/object/ObjectRepository.cpp +++ b/src/openrct2/object/ObjectRepository.cpp @@ -521,7 +521,7 @@ private: // Encode data ObjectType objectType = entry->GetType(); - sawyercoding_chunk_header chunkHeader; + SawyerCodingChunkHeader chunkHeader; chunkHeader.encoding = object_entry_group_encoding[EnumValue(objectType)]; chunkHeader.length = static_cast(dataSize); uint8_t* encodedDataBuffer = Memory::Allocate(0x600000); diff --git a/src/openrct2/object/RideObject.cpp b/src/openrct2/object/RideObject.cpp index 7444ca71a7..ac225b265e 100644 --- a/src/openrct2/object/RideObject.cpp +++ b/src/openrct2/object/RideObject.cpp @@ -51,7 +51,7 @@ static constexpr SpritePrecision PrecisionFromNumFrames(uint8_t numRotationFrame return static_cast(UtilBitScanForward(numRotationFrames) + 1); } -static void RideObjectUpdateRideType(rct_ride_entry& rideEntry) +static void RideObjectUpdateRideType(RideObjectEntry& rideEntry) { for (auto i = 0; i < RCT2::ObjectLimits::MaxRideTypesPerRideEntry; i++) { @@ -787,7 +787,7 @@ CarEntry RideObject::ReadJsonCar([[maybe_unused]] IReadObjectContext* context, j return car; } -vehicle_colour_preset_list RideObject::ReadJsonCarColours(json_t& jCarColours) +VehicleColourPresetList RideObject::ReadJsonCarColours(json_t& jCarColours) { Guard::Assert(jCarColours.is_array(), "RideObject::ReadJsonCarColours expects parameter jCarColours to be array"); @@ -802,7 +802,7 @@ vehicle_colour_preset_list RideObject::ReadJsonCarColours(json_t& jCarColours) { // Read all colours from first config auto config = ReadJsonColourConfiguration(firstElement); - vehicle_colour_preset_list list = {}; + VehicleColourPresetList list = {}; list.count = 255; std::copy_n(config.data(), std::min(numColours, 32), list.list); return list; @@ -810,7 +810,7 @@ vehicle_colour_preset_list RideObject::ReadJsonCarColours(json_t& jCarColours) } // Read first colour for each config - vehicle_colour_preset_list list = {}; + VehicleColourPresetList list = {}; for (size_t index = 0; index < jCarColours.size(); index++) { auto config = ReadJsonColourConfiguration(jCarColours[index]); diff --git a/src/openrct2/object/RideObject.h b/src/openrct2/object/RideObject.h index 20b63a9b45..89ae723946 100644 --- a/src/openrct2/object/RideObject.h +++ b/src/openrct2/object/RideObject.h @@ -20,8 +20,8 @@ class RideObject final : public Object { private: - rct_ride_entry _legacyType = {}; - vehicle_colour_preset_list _presetColours = {}; + RideObjectEntry _legacyType = {}; + VehicleColourPresetList _presetColours = {}; std::vector _peepLoadingPositions[RCT2::ObjectLimits::MaxCarTypesPerRideEntry]; std::vector> _peepLoadingWaypoints[RCT2::ObjectLimits::MaxCarTypesPerRideEntry]; @@ -52,7 +52,7 @@ private: void ReadJsonVehicleInfo(IReadObjectContext* context, json_t& properties); std::vector ReadJsonCars([[maybe_unused]] IReadObjectContext* context, json_t& jCars); CarEntry ReadJsonCar([[maybe_unused]] IReadObjectContext* context, json_t& jCar); - vehicle_colour_preset_list ReadJsonCarColours(json_t& jCarColours); + VehicleColourPresetList ReadJsonCarColours(json_t& jCarColours); std::vector ReadJsonColourConfiguration(json_t& jColourConfig); static uint8_t CalculateNumVerticalFrames(const CarEntry& carEntry); diff --git a/src/openrct2/object/SceneryGroupObject.h b/src/openrct2/object/SceneryGroupObject.h index a5b28b29c5..69749cf701 100644 --- a/src/openrct2/object/SceneryGroupObject.h +++ b/src/openrct2/object/SceneryGroupObject.h @@ -21,7 +21,7 @@ enum class EntertainerCostume : uint8_t; class SceneryGroupObject final : public Object { private: - rct_scenery_group_entry _legacyType = {}; + SceneryGroupEntry _legacyType = {}; std::vector _items; public: diff --git a/src/openrct2/paint/Supports.cpp b/src/openrct2/paint/Supports.cpp index 052cf812d5..8bfa861de1 100644 --- a/src/openrct2/paint/Supports.cpp +++ b/src/openrct2/paint/Supports.cpp @@ -134,13 +134,13 @@ static constexpr const uint8_t supportTypeToHeight[] = { 6, // METAL_SUPPORTS_BOXED_COATED }; -struct metal_supports_images { +struct MetalSupportsImages { uint16_t base_id; uint16_t beam_id; }; /** rct2: 0x0097B15C */ -static constexpr const metal_supports_images _97B15C[] = { +static constexpr const MetalSupportsImages _97B15C[] = { { 3243, 3209 }, // METAL_SUPPORTS_TUBES { 3279, 3262 }, // METAL_SUPPORTS_FORK { 3298, 3262 }, // METAL_SUPPORTS_FORK_ALT @@ -157,7 +157,7 @@ static constexpr const metal_supports_images _97B15C[] = { }; /** rct2: 0x0097B190 */ -static constexpr const metal_supports_images _97B190[] = { +static constexpr const MetalSupportsImages _97B190[] = { { 3243, 3226 }, // 3209 { 3279, 3262 }, { 3298, 3262 }, @@ -179,7 +179,7 @@ static constexpr const uint8_t metal_supports_slope_image_map[] = { 0, 0, 0, 0, 0, 0, 0, 15, 0, 0, 0, 16, 0, 17, 18, 0, }; -struct supports_id_desc { +struct SupportsIdDescriptor { uint16_t full; uint16_t half; uint16_t flat; @@ -187,7 +187,7 @@ struct supports_id_desc { }; /* 0x0097B1C4 */ -static constexpr const supports_id_desc WoodenSupportImageIds[] = { +static constexpr const SupportsIdDescriptor WoodenSupportImageIds[] = { { 3392, 3393, 3394, 3536 }, { 3390, 3391, 3394, 3514 }, { 3558, 3559, 3560, 3570 }, @@ -309,14 +309,14 @@ static constexpr const uint16_t* WoodenCurveSupportImageIds[12] = { }; -struct unk_supports_desc { +struct UnkSupportsDescriptor { BoundBoxXYZ bounding_box; uint8_t var_6; uint8_t var_7; }; /* 0x0097B23C */ -static constexpr const unk_supports_desc byte_97B23C[] = { +static constexpr const UnkSupportsDescriptor byte_97B23C[] = { {{{0, 0, 0}, {1, 1, 8}}, 0, 1}, // Flat to gentle {{{0, 0, 0}, {1, 1, 8}}, 0, 1}, {{{0, 0, 0}, {1, 1, 8}}, 0, 1}, @@ -401,7 +401,7 @@ static constexpr const unk_supports_desc byte_97B23C[] = { }; /* 0x0098D8D4 */ -static constexpr const unk_supports_desc byte_98D8D4[] = { +static constexpr const UnkSupportsDescriptor byte_98D8D4[] = { {{{0, 0, 0}, {1, 1, 4}}, 0, 1}, {{{0, 0, 0}, {1, 1, 4}}, 0, 1}, {{{0, 0, 0}, {1, 1, 4}}, 0, 1}, @@ -747,7 +747,7 @@ bool WoodenBSupportsPaintSetup( { uint16_t specialIndex = (special - 1) & 0xFFFF; - const unk_supports_desc& supportsDesc = byte_97B23C[specialIndex]; + const UnkSupportsDescriptor& supportsDesc = byte_97B23C[specialIndex]; if (WoodenCurveSupportImageIds[supportType] != nullptr && WoodenCurveSupportImageIds[supportType][specialIndex] != 0 && supportsDesc.var_7 != 0) @@ -1285,7 +1285,7 @@ bool PathASupportsPaintSetup( ImageIndex imageIndex = pathPaintInfo.BridgeImageId + 55 + specialIndex; - const unk_supports_desc& supportsDesc = byte_98D8D4[specialIndex]; + const UnkSupportsDescriptor& supportsDesc = byte_98D8D4[specialIndex]; auto boundBox = supportsDesc.bounding_box; boundBox.offset.z += baseHeight; diff --git a/src/openrct2/paint/tile_element/Paint.LargeScenery.cpp b/src/openrct2/paint/tile_element/Paint.LargeScenery.cpp index dbef35f686..814f077653 100644 --- a/src/openrct2/paint/tile_element/Paint.LargeScenery.cpp +++ b/src/openrct2/paint/tile_element/Paint.LargeScenery.cpp @@ -55,7 +55,7 @@ static constexpr const BoundBoxXY LargeSceneryBoundBoxes[] = { static void PaintLargeScenerySupports( PaintSession& session, uint8_t direction, uint16_t height, const LargeSceneryElement& tileElement, ImageId imageTemplate, - const rct_large_scenery_tile& tile) + const LargeSceneryTile& tile) { PROFILED_FUNCTION(); @@ -182,7 +182,7 @@ static bool Is3DTextSingleLine(const LargeSceneryText& text, std::string_view s) } static void PaintLargeScenery3DText( - PaintSession& session, const LargeSceneryEntry& sceneryEntry, const rct_large_scenery_tile& tile, + PaintSession& session, const LargeSceneryEntry& sceneryEntry, const LargeSceneryTile& tile, const LargeSceneryElement& tileElement, uint8_t direction, uint16_t height, bool isGhost) { PROFILED_FUNCTION(); diff --git a/src/openrct2/rct1/S4Importer.cpp b/src/openrct2/rct1/S4Importer.cpp index b187b89dfa..f17c5dbb1e 100644 --- a/src/openrct2/rct1/S4Importer.cpp +++ b/src/openrct2/rct1/S4Importer.cpp @@ -207,7 +207,7 @@ namespace RCT1 { *dst = {}; - source_desc desc; + SourceDescriptor desc; // If no entry is found, this is a custom scenario. bool isOfficial = ScenarioSources::TryGetById(_s4.ScenarioSlotIndex, &desc); @@ -806,7 +806,7 @@ namespace RCT1 dst->subtype = _rideTypeToRideEntryMap[EnumValue(src->Type)]; } - rct_ride_entry* rideEntry = GetRideEntryByIndex(dst->subtype); + RideObjectEntry* rideEntry = GetRideEntryByIndex(dst->subtype); // This can happen with hacked parks if (rideEntry == nullptr) { @@ -2229,7 +2229,7 @@ namespace RCT1 if (entryIndex != OBJECT_ENTRY_INDEX_NULL) { - rct_ride_entry* rideEntry = GetRideEntryByIndex(entryIndex); + RideObjectEntry* rideEntry = GetRideEntryByIndex(entryIndex); if (rideEntry != nullptr) { @@ -2248,7 +2248,7 @@ namespace RCT1 if (entryIndex != OBJECT_ENTRY_INDEX_NULL) { - rct_ride_entry* rideEntry = GetRideEntryByIndex(entryIndex); + RideObjectEntry* rideEntry = GetRideEntryByIndex(entryIndex); if (rideEntry != nullptr) { @@ -2300,7 +2300,7 @@ namespace RCT1 int32_t scNumber = _s4.ScenarioSlotIndex; if (scNumber != -1) { - source_desc sourceDesc; + SourceDescriptor sourceDesc; if (ScenarioSources::TryGetById(scNumber, &sourceDesc)) { StringId localisedStringIds[3]; diff --git a/src/openrct2/rct12/SawyerChunkReader.cpp b/src/openrct2/rct12/SawyerChunkReader.cpp index c430d506bc..49795f9e15 100644 --- a/src/openrct2/rct12/SawyerChunkReader.cpp +++ b/src/openrct2/rct12/SawyerChunkReader.cpp @@ -38,7 +38,7 @@ void SawyerChunkReader::SkipChunk() uint64_t originalPosition = _stream->GetPosition(); try { - auto header = _stream->ReadValue(); + auto header = _stream->ReadValue(); _stream->Seek(header.length, OpenRCT2::STREAM_SEEK_CURRENT); } catch (const std::exception&) @@ -54,7 +54,7 @@ std::shared_ptr SawyerChunkReader::ReadChunk() uint64_t originalPosition = _stream->GetPosition(); try { - auto header = _stream->ReadValue(); + auto header = _stream->ReadValue(); if (header.length >= MAX_UNCOMPRESSED_CHUNK_SIZE) throw SawyerChunkException(EXCEPTION_MSG_CORRUPT_CHUNK_SIZE); @@ -120,7 +120,7 @@ std::shared_ptr SawyerChunkReader::ReadChunkTrack() } auto buffer = static_cast(AllocateLargeTempBuffer()); - sawyercoding_chunk_header header{ CHUNK_ENCODING_RLE, compressedDataLength }; + SawyerCodingChunkHeader header{ CHUNK_ENCODING_RLE, compressedDataLength }; size_t uncompressedLength = DecodeChunk(buffer, MAX_UNCOMPRESSED_CHUNK_SIZE, compressedData.get(), header); if (uncompressedLength == 0) { @@ -162,7 +162,7 @@ void SawyerChunkReader::FreeChunk(void* data) FreeLargeTempBuffer(data); } -size_t SawyerChunkReader::DecodeChunk(void* dst, size_t dstCapacity, const void* src, const sawyercoding_chunk_header& header) +size_t SawyerChunkReader::DecodeChunk(void* dst, size_t dstCapacity, const void* src, const SawyerCodingChunkHeader& header) { size_t resultLength; switch (header.encoding) diff --git a/src/openrct2/rct12/SawyerChunkReader.h b/src/openrct2/rct12/SawyerChunkReader.h index 960dde0b48..949357bc00 100644 --- a/src/openrct2/rct12/SawyerChunkReader.h +++ b/src/openrct2/rct12/SawyerChunkReader.h @@ -91,7 +91,7 @@ public: static void FreeChunk(void* data); private: - static size_t DecodeChunk(void* dst, size_t dstCapacity, const void* src, const sawyercoding_chunk_header& header); + static size_t DecodeChunk(void* dst, size_t dstCapacity, const void* src, const SawyerCodingChunkHeader& header); static size_t DecodeChunkRLERepeat(void* dst, size_t dstCapacity, const void* src, size_t srcLength); static size_t DecodeChunkRLE(void* dst, size_t dstCapacity, const void* src, size_t srcLength); static size_t DecodeChunkRepeat(void* dst, size_t dstCapacity, const void* src, size_t srcLength); diff --git a/src/openrct2/rct12/SawyerChunkWriter.cpp b/src/openrct2/rct12/SawyerChunkWriter.cpp index ac5eb57357..05dc231089 100644 --- a/src/openrct2/rct12/SawyerChunkWriter.cpp +++ b/src/openrct2/rct12/SawyerChunkWriter.cpp @@ -28,7 +28,7 @@ void SawyerChunkWriter::WriteChunk(const SawyerChunk* chunk) void SawyerChunkWriter::WriteChunk(const void* src, size_t length, SAWYER_ENCODING encoding) { - sawyercoding_chunk_header header; + SawyerCodingChunkHeader header; header.encoding = static_cast(encoding); header.length = static_cast(length); diff --git a/src/openrct2/rct2/RCT2.cpp b/src/openrct2/rct2/RCT2.cpp index 693a4af722..ea89111a2b 100644 --- a/src/openrct2/rct2/RCT2.cpp +++ b/src/openrct2/rct2/RCT2.cpp @@ -21,7 +21,7 @@ namespace RCT2 { - ObjectEntryIndex RCT2RideTypeToOpenRCT2RideType(uint8_t rct2RideType, const rct_ride_entry& rideEntry) + ObjectEntryIndex RCT2RideTypeToOpenRCT2RideType(uint8_t rct2RideType, const RideObjectEntry& rideEntry) { switch (rct2RideType) { diff --git a/src/openrct2/rct2/RCT2.h b/src/openrct2/rct2/RCT2.h index d18d86373d..19f93271c2 100644 --- a/src/openrct2/rct2/RCT2.h +++ b/src/openrct2/rct2/RCT2.h @@ -18,7 +18,7 @@ #include #include -struct rct_ride_entry; +struct RideObjectEntry; class ObjectList; enum class EditorStep : uint8_t; @@ -1031,7 +1031,7 @@ namespace RCT2 assert_struct_size(StexEntry, 7); #pragma pack(pop) - ObjectEntryIndex RCT2RideTypeToOpenRCT2RideType(uint8_t rct2RideType, const rct_ride_entry& rideEntry); + ObjectEntryIndex RCT2RideTypeToOpenRCT2RideType(uint8_t rct2RideType, const RideObjectEntry& rideEntry); bool RCT2TrackTypeIsBooster(ride_type_t rideType, uint16_t trackType); bool RCT2RideTypeNeedsConversion(uint8_t rct2RideType); uint8_t OpenRCT2RideTypeToRCT2RideType(ObjectEntryIndex openrct2Type); diff --git a/src/openrct2/rct2/T6Importer.cpp b/src/openrct2/rct2/T6Importer.cpp index 9193fbfae1..4ced4348d1 100644 --- a/src/openrct2/rct2/T6Importer.cpp +++ b/src/openrct2/rct2/T6Importer.cpp @@ -222,7 +222,7 @@ namespace RCT2 auto rawObject = ObjectRepositoryLoadObject(&td->vehicle_object.Entry); if (rawObject != nullptr) { - const auto* rideEntry = static_cast( + const auto* rideEntry = static_cast( static_cast(rawObject.get())->GetLegacyData()); if (rideEntry != nullptr) { diff --git a/src/openrct2/ride/CableLift.cpp b/src/openrct2/ride/CableLift.cpp index 9fd3e84390..be085a84a3 100644 --- a/src/openrct2/ride/CableLift.cpp +++ b/src/openrct2/ride/CableLift.cpp @@ -310,7 +310,7 @@ bool Vehicle::CableLiftUpdateTrackMotionBackwards() TileElement* trackElement = MapGetTrackElementAtOfTypeSeq(TrackLocation, trackType, 0); auto input = CoordsXYE{ TrackLocation, trackElement }; - track_begin_end output; + TrackBeginEnd output; if (!TrackBlockGetPrevious(input, &output)) return false; diff --git a/src/openrct2/ride/Ride.cpp b/src/openrct2/ride/Ride.cpp index d0cc51e092..961b96cf72 100644 --- a/src/openrct2/ride/Ride.cpp +++ b/src/openrct2/ride/Ride.cpp @@ -197,15 +197,15 @@ Ride* GetRide(RideId index) return nullptr; } -rct_ride_entry* GetRideEntryByIndex(ObjectEntryIndex index) +RideObjectEntry* GetRideEntryByIndex(ObjectEntryIndex index) { - rct_ride_entry* result = nullptr; + RideObjectEntry* result = nullptr; auto& objMgr = OpenRCT2::GetContext()->GetObjectManager(); auto obj = objMgr.GetLoadedObject(ObjectType::Ride, index); if (obj != nullptr) { - result = static_cast(obj->GetLegacyData()); + result = static_cast(obj->GetLegacyData()); } return result; @@ -227,7 +227,7 @@ std::string_view GetRideEntryName(ObjectEntryIndex index) return {}; } -rct_ride_entry* Ride::GetRideEntry() const +RideObjectEntry* Ride::GetRideEntry() const { return GetRideEntryByIndex(subtype); } @@ -369,7 +369,7 @@ void RideUpdateFavouritedStat() money64 Ride::CalculateIncomePerHour() const { // Get entry by ride to provide better reporting - rct_ride_entry* entry = GetRideEntry(); + RideObjectEntry* entry = GetRideEntry(); if (entry == nullptr) { return 0; @@ -595,7 +595,7 @@ bool TrackBlockGetNext(CoordsXYE* input, CoordsXYE* output, int32_t* z, int32_t* * rct2: 0x006C63D6 */ bool TrackBlockGetPreviousFromZero( - const CoordsXYZ& startPos, const Ride& ride, uint8_t direction, track_begin_end* outTrackBeginEnd) + const CoordsXYZ& startPos, const Ride& ride, uint8_t direction, TrackBeginEnd* outTrackBeginEnd) { uint8_t directionStart = direction; direction = DirectionReverse(direction); @@ -687,7 +687,7 @@ bool TrackBlockGetPreviousFromZero( * higher two bytes of ecx and edx where as outTrackBeginEnd.end_x and * outTrackBeginEnd.end_y will be in the lower two bytes (cx and dx). */ -bool TrackBlockGetPrevious(const CoordsXYE& trackPos, track_begin_end* outTrackBeginEnd) +bool TrackBlockGetPrevious(const CoordsXYE& trackPos, TrackBeginEnd* outTrackBeginEnd) { if (trackPos.element == nullptr) return false; @@ -1456,7 +1456,7 @@ bool Ride::CanBreakDown() const return false; } - rct_ride_entry* entry = GetRideEntry(); + RideObjectEntry* entry = GetRideEntry(); return entry != nullptr && !(entry->flags & RIDE_ENTRY_FLAG_CANNOT_BREAK_DOWN); } @@ -2186,8 +2186,8 @@ int32_t RideGetUnusedPresetVehicleColour(ObjectEntryIndex subType) */ void RideSetVehicleColoursToRandomPreset(Ride& ride, uint8_t preset_index) { - rct_ride_entry* rideEntry = GetRideEntryByIndex(ride.subtype); - vehicle_colour_preset_list* presetList = rideEntry->vehicle_preset_list; + RideObjectEntry* rideEntry = GetRideEntryByIndex(ride.subtype); + VehicleColourPresetList* presetList = rideEntry->vehicle_preset_list; if (presetList->count != 0 && presetList->count != 255) { @@ -2841,7 +2841,7 @@ static int32_t ride_check_station_length(const CoordsXYE& input, CoordsXYE* outp output->x = input.x; output->y = input.y; output->element = input.element; - track_begin_end trackBeginEnd; + TrackBeginEnd trackBeginEnd; while (TrackBlockGetPrevious(*output, &trackBeginEnd)) { output->x = trackBeginEnd.begin_x; @@ -2933,7 +2933,7 @@ static void ride_set_boat_hire_return_point(Ride& ride, const CoordsXYE& startEl auto returnPos = startElement; int32_t startX = returnPos.x; int32_t startY = returnPos.y; - track_begin_end trackBeginEnd; + TrackBeginEnd trackBeginEnd; while (TrackBlockGetPrevious(returnPos, &trackBeginEnd)) { // If previous track is back to the starting x, y, then break loop (otherwise possible infinite loop) @@ -3397,7 +3397,7 @@ static void ride_create_vehicles_find_first_block(const Ride& ride, CoordsXYE* o CoordsXY trackPos = curTrackPos; auto trackElement = curTrackElement; - track_begin_end trackBeginEnd; + TrackBeginEnd trackBeginEnd; while (TrackBlockGetPrevious({ trackPos, reinterpret_cast(trackElement) }, &trackBeginEnd)) { trackPos = { trackBeginEnd.end_x, trackBeginEnd.end_y }; @@ -4024,12 +4024,12 @@ ResultWithMessage Ride::Open(bool isApplying) */ void RideGetStartOfTrack(CoordsXYE* output) { - track_begin_end trackBeginEnd; + TrackBeginEnd trackBeginEnd; CoordsXYE trackElement = *output; if (TrackBlockGetPrevious(trackElement, &trackBeginEnd)) { TileElement* initial_map = trackElement.element; - track_begin_end slowIt = trackBeginEnd; + TrackBeginEnd slowIt = trackBeginEnd; bool moveSlowIt = true; do { @@ -4158,7 +4158,7 @@ int32_t RideGetRandomColourPresetIndex(ride_type_t rideType) */ void Ride::SetColourPreset(uint8_t index) { - const track_colour_preset_list* colourPresets = &GetRideTypeDescriptor().ColourPresets; + const TrackColourPresetList* colourPresets = &GetRideTypeDescriptor().ColourPresets; TrackColour colours = { COLOUR_BLACK, COLOUR_BLACK, COLOUR_BLACK }; // Stalls save their default colour in the vehicle settings (since they share a common ride type) if (!IsRide()) @@ -4215,7 +4215,7 @@ void Ride::SetNameToDefault() /** * This will return the name of the ride, as seen in the New Ride window. */ -RideNaming GetRideNaming(const ride_type_t rideType, const rct_ride_entry& rideEntry) +RideNaming GetRideNaming(const ride_type_t rideType, const RideObjectEntry& rideEntry) { if (!GetRideTypeDescriptor(rideType).HasFlag(RIDE_TYPE_FLAG_LIST_VEHICLES_SEPARATELY)) { @@ -4583,7 +4583,7 @@ void RideUpdateVehicleColours(const Ride& ride) uint8_t RideEntryGetVehicleAtPosition(int32_t rideEntryIndex, int32_t numCarsPerTrain, int32_t position) { - rct_ride_entry* rideEntry = GetRideEntryByIndex(rideEntryIndex); + RideObjectEntry* rideEntry = GetRideEntryByIndex(rideEntryIndex); if (position == 0 && rideEntry->FrontCar != 255) { return rideEntry->FrontCar; @@ -4613,7 +4613,7 @@ struct NecessarySpriteGroup }; // Finds track pieces that a given ride entry has sprites for -OpenRCT2::BitSet RideEntryGetSupportedTrackPieces(const rct_ride_entry& rideEntry) +OpenRCT2::BitSet RideEntryGetSupportedTrackPieces(const RideObjectEntry& rideEntry) { // TODO: Use a std::span when C++20 available as 6 is due to jagged array static const std::array trackPieceRequiredSprites[TRACK_GROUP_COUNT] = { @@ -4878,7 +4878,7 @@ void Ride::UpdateMaxVehicles() if (subtype == OBJECT_ENTRY_INDEX_NULL) return; - rct_ride_entry* rideEntry = GetRideEntryByIndex(subtype); + RideObjectEntry* rideEntry = GetRideEntryByIndex(subtype); if (rideEntry == nullptr) { return; @@ -5326,7 +5326,7 @@ void FixInvalidVehicleSpriteSizes() } } -bool RideEntryHasCategory(const rct_ride_entry& rideEntry, uint8_t category) +bool RideEntryHasCategory(const RideObjectEntry& rideEntry, uint8_t category) { auto rideType = rideEntry.GetFirstNonNullRideType(); return GetRideTypeDescriptor(rideType).Category == category; @@ -5761,7 +5761,7 @@ ResultWithMessage Ride::ChangeStatusCheckTrackValidity(const CoordsXYE& trackEle if (subtype != OBJECT_ENTRY_INDEX_NULL && !gCheatsEnableAllDrawableTrackPieces) { - rct_ride_entry* rideEntry = GetRideEntryByIndex(subtype); + RideObjectEntry* rideEntry = GetRideEntryByIndex(subtype); if (rideEntry->flags & RIDE_ENTRY_FLAG_NO_INVERSIONS) { if (ride_check_track_contains_inversions(trackElement, &problematicTrackElement)) diff --git a/src/openrct2/ride/Ride.h b/src/openrct2/ride/Ride.h index 3e65b176ff..61fb2f8026 100644 --- a/src/openrct2/ride/Ride.h +++ b/src/openrct2/ride/Ride.h @@ -37,7 +37,7 @@ struct RideTypeDescriptor; struct Guest; struct Staff; struct Vehicle; -struct rct_ride_entry; +struct RideObjectEntry; struct ResultWithMessage; #define RIDE_ADJACENCY_CHECK_DISTANCE 5 @@ -353,7 +353,7 @@ public: void SetColourPreset(uint8_t index); - rct_ride_entry* GetRideEntry() const; + RideObjectEntry* GetRideEntry() const; size_t GetNumPrices() const; int32_t GetAge() const; @@ -412,7 +412,7 @@ void UpdateChairlift(Ride& ride); #pragma pack(push, 1) -struct track_begin_end +struct TrackBeginEnd { int32_t begin_x; int32_t begin_y; @@ -425,16 +425,9 @@ struct track_begin_end TileElement* end_element; }; #ifdef PLATFORM_32BIT -assert_struct_size(track_begin_end, 36); +assert_struct_size(TrackBeginEnd, 36); #endif -struct ride_name_args -{ - uint16_t type_name; - uint16_t number; -}; -assert_struct_size(ride_name_args, 4); - #pragma pack(pop) // Constants used by the lifecycle_flags property at 0x1D0 @@ -1002,7 +995,7 @@ struct RideManager RideManager GetRideManager(); RideId GetNextFreeRideId(); Ride* GetOrAllocateRide(RideId index); -rct_ride_entry* GetRideEntryByIndex(ObjectEntryIndex index); +RideObjectEntry* GetRideEntryByIndex(ObjectEntryIndex index); std::string_view GetRideEntryName(ObjectEntryIndex index); extern money16 gTotalRideValueForMoney; @@ -1057,9 +1050,9 @@ bool TrackBlockGetNextFromZero( const CoordsXYZ& startPos, const Ride& ride, uint8_t direction_start, CoordsXYE* output, int32_t* z, int32_t* direction, bool isGhost); -bool TrackBlockGetPrevious(const CoordsXYE& trackPos, track_begin_end* outTrackBeginEnd); +bool TrackBlockGetPrevious(const CoordsXYE& trackPos, TrackBeginEnd* outTrackBeginEnd); bool TrackBlockGetPreviousFromZero( - const CoordsXYZ& startPos, const Ride& ride, uint8_t direction, track_begin_end* outTrackBeginEnd); + const CoordsXYZ& startPos, const Ride& ride, uint8_t direction, TrackBeginEnd* outTrackBeginEnd); void RideGetStartOfTrack(CoordsXYE* output); @@ -1073,7 +1066,7 @@ void RideFixBreakdown(Ride& ride, int32_t reliabilityIncreaseFactor); uint8_t RideEntryGetVehicleAtPosition(int32_t rideEntryIndex, int32_t numCarsPerTrain, int32_t position); void RideUpdateVehicleColours(const Ride& ride); -OpenRCT2::BitSet RideEntryGetSupportedTrackPieces(const rct_ride_entry& rideEntry); +OpenRCT2::BitSet RideEntryGetSupportedTrackPieces(const RideObjectEntry& rideEntry); enum class RideSetSetting : uint8_t; money32 SetOperatingSetting(RideId rideId, RideSetSetting setting, uint8_t value); @@ -1095,7 +1088,7 @@ bool RideHasRatings(const Ride& ride); int32_t GetBoosterSpeed(ride_type_t rideType, int32_t rawSpeed); void FixInvalidVehicleSpriteSizes(); -bool RideEntryHasCategory(const rct_ride_entry& rideEntry, uint8_t category); +bool RideEntryHasCategory(const RideObjectEntry& rideEntry, uint8_t category); int32_t RideGetEntryIndex(int32_t rideType, int32_t rideSubType); diff --git a/src/openrct2/ride/RideConstruction.cpp b/src/openrct2/ride/RideConstruction.cpp index af570faeef..c447521821 100644 --- a/src/openrct2/ride/RideConstruction.cpp +++ b/src/openrct2/ride/RideConstruction.cpp @@ -94,7 +94,7 @@ using namespace OpenRCT2::TrackMetaData; static int32_t ride_check_if_construction_allowed(Ride& ride) { Formatter ft; - rct_ride_entry* rideEntry = ride.GetRideEntry(); + RideObjectEntry* rideEntry = ride.GetRideEntry(); if (rideEntry == nullptr) { ContextShowError(STR_INVALID_RIDE_TYPE, STR_CANT_EDIT_INVALID_RIDE_TYPE, ft); @@ -630,7 +630,7 @@ void RideConstructionSetDefaultNextPiece() const auto& rtd = ride->GetRideTypeDescriptor(); int32_t z, direction, trackType, curve, bank, slope; - track_begin_end trackBeginEnd; + TrackBeginEnd trackBeginEnd; CoordsXYE xyElement; TileElement* tileElement; _currentTrackPrice = MONEY32_UNDEFINED; @@ -834,7 +834,7 @@ void RideSelectPreviousSection() // Invalidate previous track piece (we may not be changing height!) VirtualFloorInvalidate(); - track_begin_end trackBeginEnd; + TrackBeginEnd trackBeginEnd; if (TrackBlockGetPrevious({ *newCoords, tileElement }, &trackBeginEnd)) { _currentTrackBegin.x = trackBeginEnd.begin_x; @@ -1590,7 +1590,7 @@ bool RideSelectBackwardsFromFront() if (ride != nullptr) { RideConstructionInvalidateCurrentTrack(); - track_begin_end trackBeginEnd; + TrackBeginEnd trackBeginEnd; if (TrackBlockGetPreviousFromZero(_currentTrackBegin, *ride, _currentTrackPieceDirection, &trackBeginEnd)) { _rideConstructionState = RideConstructionState::Selected; diff --git a/src/openrct2/ride/RideData.h b/src/openrct2/ride/RideData.h index 0224c390d6..a51951241a 100644 --- a/src/openrct2/ride/RideData.h +++ b/src/openrct2/ride/RideData.h @@ -110,7 +110,7 @@ struct RideHeights uint8_t PlatformHeight; }; -struct rct_ride_lift_data +struct RideLiftData { OpenRCT2::Audio::SoundId sound_id; uint8_t minimum_speed; @@ -202,7 +202,7 @@ struct RideTypeDescriptor RideHeights Heights; uint8_t MaxMass; /** rct2: 0x0097D7C8, 0x0097D7C9, 0x0097D7CA */ - rct_ride_lift_data LiftData; + RideLiftData LiftData; // rct2: 0x0097E050 ride_ratings_calculation RatingsCalculationFunction; // rct2: 0x0097CD1E @@ -216,7 +216,7 @@ struct RideTypeDescriptor ShopItemIndex PhotoItem; /** rct2: 0x0097D21E */ uint8_t BonusValue; - track_colour_preset_list ColourPresets; + TrackColourPresetList ColourPresets; RideColourPreview ColourPreview; RideColourKey ColourKey; diff --git a/src/openrct2/ride/RideEntry.h b/src/openrct2/ride/RideEntry.h index 93e547718d..a58975254d 100644 --- a/src/openrct2/ride/RideEntry.h +++ b/src/openrct2/ride/RideEntry.h @@ -28,13 +28,13 @@ struct RideNaming StringId Description; }; -struct track_colour_preset_list +struct TrackColourPresetList { uint8_t count; TrackColour list[256]; }; -struct vehicle_colour_preset_list +struct VehicleColourPresetList { uint8_t count; VehicleColour list[256]; @@ -43,7 +43,7 @@ struct vehicle_colour_preset_list /** * Ride type structure. */ -struct rct_ride_entry +struct RideObjectEntry { RideNaming naming; // The first three images are previews. They correspond to the ride_type[] array. @@ -65,7 +65,7 @@ struct rct_ride_entry uint8_t ThirdCar; uint8_t BuildMenuPriority; CarEntry Cars[RCT2::ObjectLimits::MaxCarTypesPerRideEntry]; - vehicle_colour_preset_list* vehicle_preset_list; + VehicleColourPresetList* vehicle_preset_list; int8_t excitement_multiplier; int8_t intensity_multiplier; int8_t nausea_multiplier; @@ -100,4 +100,4 @@ struct rct_ride_entry } }; -RideNaming GetRideNaming(const ride_type_t rideType, const rct_ride_entry& rideEntry); +RideNaming GetRideNaming(const ride_type_t rideType, const RideObjectEntry& rideEntry); diff --git a/src/openrct2/ride/RideRatings.cpp b/src/openrct2/ride/RideRatings.cpp index 8f0fecc800..8cc576dc15 100644 --- a/src/openrct2/ride/RideRatings.cpp +++ b/src/openrct2/ride/RideRatings.cpp @@ -361,7 +361,7 @@ static void ride_ratings_update_state_5(RideRatingUpdateState& state) { ride_ratings_score_close_proximity(state, tileElement); - track_begin_end trackBeginEnd; + TrackBeginEnd trackBeginEnd; if (!TrackBlockGetPrevious({ state.Proximity, tileElement }, &trackBeginEnd)) { state.State = RIDE_RATINGS_STATE_CALCULATE; @@ -976,7 +976,7 @@ static uint16_t ride_compute_upkeep(RideRatingUpdateState& state, const Ride& ri */ static void ride_ratings_apply_adjustments(const Ride& ride, RatingTuple* ratings) { - rct_ride_entry* rideEntry = GetRideEntryByIndex(ride.subtype); + RideObjectEntry* rideEntry = GetRideEntryByIndex(ride.subtype); if (rideEntry == nullptr) { @@ -1135,7 +1135,7 @@ static ShelteredEights get_num_of_sheltered_eighths(const Ride& ride) } uint8_t trackShelteredEighths = numShelteredEighths; - rct_ride_entry* rideType = GetRideEntryByIndex(ride.subtype); + RideObjectEntry* rideType = GetRideEntryByIndex(ride.subtype); if (rideType == nullptr) { return { 0, 0 }; diff --git a/src/openrct2/ride/Station.cpp b/src/openrct2/ride/Station.cpp index f432596ae1..ca4238f562 100644 --- a/src/openrct2/ride/Station.cpp +++ b/src/openrct2/ride/Station.cpp @@ -280,7 +280,7 @@ static void ride_race_init_vehicle_speeds(const Ride& ride) vehicle->ClearUpdateFlag(VEHICLE_UPDATE_FLAG_6); - rct_ride_entry* rideEntry = vehicle->GetRideEntry(); + RideObjectEntry* rideEntry = vehicle->GetRideEntry(); vehicle->speed = (ScenarioRand() & 15) - 8 + rideEntry->Cars[vehicle->vehicle_type].powered_max_speed; diff --git a/src/openrct2/ride/Track.cpp b/src/openrct2/ride/Track.cpp index 01aaea8a61..570e5a89dd 100644 --- a/src/openrct2/ride/Track.cpp +++ b/src/openrct2/ride/Track.cpp @@ -414,7 +414,7 @@ void TrackCircuitIteratorBegin(track_circuit_iterator* it, CoordsXYE first) bool TrackCircuitIteratorPrevious(track_circuit_iterator* it) { - track_begin_end trackBeginEnd; + TrackBeginEnd trackBeginEnd; if (it->first == nullptr) { @@ -485,7 +485,7 @@ bool TrackCircuitIteratorsMatch(const track_circuit_iterator* firstIt, const tra void TrackGetBack(const CoordsXYE& input, CoordsXYE* output) { CoordsXYE lastTrack; - track_begin_end currentTrack; + TrackBeginEnd currentTrack; bool result; lastTrack = input; diff --git a/src/openrct2/ride/TrackDesign.cpp b/src/openrct2/ride/TrackDesign.cpp index a66d17d160..06d6ade2ed 100644 --- a/src/openrct2/ride/TrackDesign.cpp +++ b/src/openrct2/ride/TrackDesign.cpp @@ -781,7 +781,7 @@ static void TrackDesignMirrorScenery(TrackDesign* td6) { auto* sceneryEntry = reinterpret_cast(obj->GetLegacyData()); int16_t x1 = 0, x2 = 0, y1 = 0, y2 = 0; - for (rct_large_scenery_tile* tile = sceneryEntry->tiles; tile->x_offset != -1; tile++) + for (LargeSceneryTile* tile = sceneryEntry->tiles; tile->x_offset != -1; tile++) { if (x1 > tile->x_offset) { diff --git a/src/openrct2/ride/TrackDesignSave.cpp b/src/openrct2/ride/TrackDesignSave.cpp index 02069aa011..1df24d6a33 100644 --- a/src/openrct2/ride/TrackDesignSave.cpp +++ b/src/openrct2/ride/TrackDesignSave.cpp @@ -146,7 +146,7 @@ bool TrackDesignSaveContainsTileElement(const TileElement* tileElement) static int32_t tile_element_get_total_element_count(TileElement* tileElement) { int32_t elementCount; - rct_large_scenery_tile* tile; + LargeSceneryTile* tile; switch (tileElement->GetType()) { diff --git a/src/openrct2/ride/Vehicle.cpp b/src/openrct2/ride/Vehicle.cpp index 63380c4b57..e2b4e555ed 100644 --- a/src/openrct2/ride/Vehicle.cpp +++ b/src/openrct2/ride/Vehicle.cpp @@ -810,7 +810,7 @@ OpenRCT2::Audio::VehicleSoundParams Vehicle::CreateSoundParam(uint16_t priority) int32_t frequency = std::abs(velocity); - rct_ride_entry* rideType = GetRideEntry(); + RideObjectEntry* rideType = GetRideEntry(); if (rideType != nullptr) { if (rideType->Cars[vehicle_type].double_sound_frequency & 1) @@ -2018,7 +2018,7 @@ void Vehicle::UpdateMovingToEndOfStation() break; default: { - rct_ride_entry* rideEntry = GetRideEntry(); + RideObjectEntry* rideEntry = GetRideEntry(); if (rideEntry == nullptr) { return; @@ -2330,7 +2330,7 @@ void Vehicle::UpdateDodgemsMode() if (curRide == nullptr) return; - rct_ride_entry* rideEntry = GetRideEntry(); + RideObjectEntry* rideEntry = GetRideEntry(); if (rideEntry == nullptr) { return; @@ -3915,7 +3915,7 @@ void Vehicle::UpdateArriving() stationBrakesWork = false; } - rct_ride_entry* rideEntry = GetRideEntry(); + RideObjectEntry* rideEntry = GetRideEntry(); CarEntry* carEntry = &rideEntry->Cars[vehicle_type]; UpdateArrivingPassThroughStation(*curRide, *carEntry, stationBrakesWork); @@ -5608,7 +5608,7 @@ OpenRCT2::Audio::SoundId Vehicle::UpdateScreamSound() OpenRCT2::Audio::SoundId Vehicle::ProduceScreamSound(const int32_t totalNumPeeps) { - rct_ride_entry* rideEntry = GetRideEntry(); + RideObjectEntry* rideEntry = GetRideEntry(); CarEntry* carEntry = &rideEntry->Cars[vehicle_type]; @@ -5893,7 +5893,7 @@ int32_t Vehicle::UpdateMotionDodgems() { eax /= mass; } - rct_ride_entry* rideEntry = GetRideEntry(); + RideObjectEntry* rideEntry = GetRideEntry(); CarEntry* carEntry = &rideEntry->Cars[vehicle_type]; if (!(carEntry->flags & CAR_ENTRY_FLAG_POWERED)) @@ -6193,7 +6193,7 @@ static void block_brakes_open_previous_section( const Ride& ride, const CoordsXYZ& vehicleTrackLocation, TileElement* tileElement) { auto location = vehicleTrackLocation; - track_begin_end trackBeginEnd, slowTrackBeginEnd; + TrackBeginEnd trackBeginEnd, slowTrackBeginEnd; TileElement slowTileElement = *tileElement; bool counter = true; CoordsXY slowLocation = location; @@ -7007,7 +7007,7 @@ static void vehicle_update_play_water_splash_sound() */ void Vehicle::UpdateHandleWaterSplash() const { - rct_ride_entry* rideEntry = GetRideEntry(); + RideObjectEntry* rideEntry = GetRideEntry(); auto trackType = GetTrackType(); if (!(rideEntry->flags & RIDE_ENTRY_FLAG_PLAY_SPLASH_SOUND)) @@ -7392,7 +7392,7 @@ void Vehicle::Sub6DBF3E() * * rct2: 0x006DB08C */ -bool Vehicle::UpdateTrackMotionForwardsGetNewTrack(uint16_t trackType, const Ride& curRide, const rct_ride_entry& rideEntry) +bool Vehicle::UpdateTrackMotionForwardsGetNewTrack(uint16_t trackType, const Ride& curRide, const RideObjectEntry& rideEntry) { CoordsXYZD location = {}; @@ -7454,7 +7454,7 @@ bool Vehicle::UpdateTrackMotionForwardsGetNewTrack(uint16_t trackType, const Rid if (isGoingBack) { - track_begin_end trackBeginEnd; + TrackBeginEnd trackBeginEnd; if (!TrackBlockGetPrevious({ TrackLocation, tileElement }, &trackBeginEnd)) { return false; @@ -7573,7 +7573,7 @@ bool Vehicle::UpdateTrackMotionForwardsGetNewTrack(uint16_t trackType, const Rid * * rct2: 0x006DAEB9 */ -bool Vehicle::UpdateTrackMotionForwards(CarEntry* carEntry, const Ride& curRide, const rct_ride_entry& rideEntry) +bool Vehicle::UpdateTrackMotionForwards(CarEntry* carEntry, const Ride& curRide, const RideObjectEntry& rideEntry) { EntityId otherVehicleIndex = EntityId::GetNull(); Loc6DAEB9: @@ -7852,7 +7852,7 @@ bool Vehicle::UpdateTrackMotionBackwardsGetNewTrack(uint16_t trackType, const Ri if (nextTileBackwards) { // Loc6DBB7E:; - track_begin_end trackBeginEnd; + TrackBeginEnd trackBeginEnd; if (!TrackBlockGetPrevious({ trackPos, tileElement }, &trackBeginEnd)) { return false; @@ -7971,7 +7971,7 @@ bool Vehicle::UpdateTrackMotionBackwardsGetNewTrack(uint16_t trackType, const Ri * * rct2: 0x006DBA33 */ -bool Vehicle::UpdateTrackMotionBackwards(CarEntry* carEntry, const Ride& curRide, const rct_ride_entry& rideEntry) +bool Vehicle::UpdateTrackMotionBackwards(CarEntry* carEntry, const Ride& curRide, const RideObjectEntry& rideEntry) { EntityId otherVehicleIndex = EntityId::GetNull(); @@ -8119,7 +8119,7 @@ bool Vehicle::UpdateTrackMotionBackwards(CarEntry* carEntry, const Ride& curRide * */ -void Vehicle::UpdateTrackMotionMiniGolfVehicle(const Ride& curRide, const rct_ride_entry& rideEntry, CarEntry* carEntry) +void Vehicle::UpdateTrackMotionMiniGolfVehicle(const Ride& curRide, const RideObjectEntry& rideEntry, CarEntry* carEntry) { EntityId otherVehicleIndex = EntityId::GetNull(); TileElement* tileElement = nullptr; @@ -8458,7 +8458,7 @@ Loc6DCA9A: tileElement = MapGetTrackElementAtOfTypeSeq(TrackLocation, GetTrackType(), 0); { - track_begin_end trackBeginEnd; + TrackBeginEnd trackBeginEnd; if (!TrackBlockGetPrevious({ TrackLocation, tileElement }, &trackBeginEnd)) { goto Loc6DC9BC; @@ -8741,7 +8741,7 @@ int32_t Vehicle::UpdateTrackMotionMiniGolf(int32_t* outStation) if (curRide == nullptr) return 0; - rct_ride_entry* rideEntry = GetRideEntry(); + RideObjectEntry* rideEntry = GetRideEntry(); if (rideEntry == nullptr) return 0; @@ -8904,7 +8904,7 @@ int32_t Vehicle::UpdateTrackMotion(int32_t* outStation) if (curRide == nullptr) return 0; - rct_ride_entry* rideEntry = GetRideEntry(); + RideObjectEntry* rideEntry = GetRideEntry(); auto carEntry = Entry(); if (carEntry == nullptr) @@ -9119,14 +9119,14 @@ int32_t Vehicle::UpdateTrackMotion(int32_t* outStation) return _vehicleMotionTrackFlags; } -rct_ride_entry* Vehicle::GetRideEntry() const +RideObjectEntry* Vehicle::GetRideEntry() const { return GetRideEntryByIndex(ride_subtype); } CarEntry* Vehicle::Entry() const { - rct_ride_entry* rideEntry = GetRideEntry(); + RideObjectEntry* rideEntry = GetRideEntry(); if (rideEntry == nullptr) { return nullptr; @@ -9185,7 +9185,7 @@ void Vehicle::UpdateCrossings() const backVehicle = this; } - track_begin_end output{}; + TrackBeginEnd output{}; int32_t direction{}; CoordsXYE xyElement = { frontVehicle->TrackLocation, @@ -9286,7 +9286,7 @@ void Vehicle::UpdateCrossings() const void Vehicle::Claxon() const { - rct_ride_entry* rideEntry = GetRideEntry(); + RideObjectEntry* rideEntry = GetRideEntry(); switch (rideEntry->Cars[vehicle_type].sound_range) { case SOUND_RANGE_WHISTLE: diff --git a/src/openrct2/ride/Vehicle.h b/src/openrct2/ride/Vehicle.h index 51f46becb1..c2c5060b6c 100644 --- a/src/openrct2/ride/Vehicle.h +++ b/src/openrct2/ride/Vehicle.h @@ -27,7 +27,7 @@ using track_type_t = uint16_t; struct Ride; -struct rct_ride_entry; +struct RideObjectEntry; struct CarEntry; class DataSerialiser; struct PaintSession; @@ -226,7 +226,7 @@ struct Vehicle : EntityBase GForces GetGForces() const; void SetMapToolbar() const; int32_t IsUsedInPairs() const; - rct_ride_entry* GetRideEntry() const; + RideObjectEntry* GetRideEntry() const; CarEntry* Entry() const; Ride* GetRide() const; Vehicle* TrainHead() const; @@ -333,8 +333,8 @@ private: void UpdateAdditionalAnimation(); void CheckIfMissing(); bool CurrentTowerElementIsTop(); - bool UpdateTrackMotionForwards(CarEntry* carEntry, const Ride& curRide, const rct_ride_entry& rideEntry); - bool UpdateTrackMotionBackwards(CarEntry* carEntry, const Ride& curRide, const rct_ride_entry& rideEntry); + bool UpdateTrackMotionForwards(CarEntry* carEntry, const Ride& curRide, const RideObjectEntry& rideEntry); + bool UpdateTrackMotionBackwards(CarEntry* carEntry, const Ride& curRide, const RideObjectEntry& rideEntry); int32_t UpdateTrackMotionPoweredRideAcceleration(CarEntry* carEntry, uint32_t totalMass, const int32_t curAcceleration); int32_t NumPeepsUntilTrainTail() const; void InvalidateWindow(); @@ -364,8 +364,8 @@ private: void TrainReadyToDepart(uint8_t num_peeps_on_train, uint8_t num_used_seats); int32_t UpdateTrackMotionMiniGolfCalculateAcceleration(const CarEntry& carEntry); int32_t UpdateTrackMotionMiniGolf(int32_t* outStation); - void UpdateTrackMotionMiniGolfVehicle(const Ride& curRide, const rct_ride_entry& rideEntry, CarEntry* carEntry); - bool UpdateTrackMotionForwardsGetNewTrack(uint16_t trackType, const Ride& curRide, const rct_ride_entry& rideEntry); + void UpdateTrackMotionMiniGolfVehicle(const Ride& curRide, const RideObjectEntry& rideEntry, CarEntry* carEntry); + bool UpdateTrackMotionForwardsGetNewTrack(uint16_t trackType, const Ride& curRide, const RideObjectEntry& rideEntry); bool UpdateTrackMotionBackwardsGetNewTrack(uint16_t trackType, const Ride& curRide, uint16_t* progress); bool UpdateMotionCollisionDetection(const CoordsXYZ& loc, EntityId* otherVehicleIndex); void UpdateGoKartAttemptSwitchLanes(); diff --git a/src/openrct2/ride/gentle/FerrisWheel.cpp b/src/openrct2/ride/gentle/FerrisWheel.cpp index 6d3b4bf467..52953d20d7 100644 --- a/src/openrct2/ride/gentle/FerrisWheel.cpp +++ b/src/openrct2/ride/gentle/FerrisWheel.cpp @@ -42,7 +42,7 @@ static constexpr BoundBoxXY FerrisWheelData[] = { }; static void PaintFerrisWheelRiders( - PaintSession& session, const rct_ride_entry& rideEntry, const Vehicle& vehicle, uint8_t direction, const CoordsXYZ offset, + PaintSession& session, const RideObjectEntry& rideEntry, const Vehicle& vehicle, uint8_t direction, const CoordsXYZ offset, const BoundBoxXYZ& bb) { for (int32_t i = 0; i < 32; i += 2) diff --git a/src/openrct2/ride/gentle/MerryGoRound.cpp b/src/openrct2/ride/gentle/MerryGoRound.cpp index dd3ceea3ff..95f13c3008 100644 --- a/src/openrct2/ride/gentle/MerryGoRound.cpp +++ b/src/openrct2/ride/gentle/MerryGoRound.cpp @@ -26,7 +26,7 @@ static constexpr const uint16_t MerryGoRoundBreakdownVibration[] = { }; static void PaintRiders( - PaintSession& session, const Ride& ride, const rct_ride_entry& rideEntry, const Vehicle& vehicle, int32_t rotationOffset, + PaintSession& session, const Ride& ride, const RideObjectEntry& rideEntry, const Vehicle& vehicle, int32_t rotationOffset, const CoordsXYZ& offset, const BoundBoxXYZ& bb) { if (session.DPI.zoom_level > ZoomLevel{ 0 }) diff --git a/src/openrct2/ride/gentle/SpaceRings.cpp b/src/openrct2/ride/gentle/SpaceRings.cpp index 8f12864c44..e7812e3c87 100644 --- a/src/openrct2/ride/gentle/SpaceRings.cpp +++ b/src/openrct2/ride/gentle/SpaceRings.cpp @@ -40,7 +40,7 @@ static void PaintSpaceRingsStructure( if (ride.num_stations == 0 || vehicleIndex < ride.NumTrains) { - rct_ride_entry* rideEntry = GetRideEntryByIndex(ride.subtype); + RideObjectEntry* rideEntry = GetRideEntryByIndex(ride.subtype); int32_t frameNum = direction; diff --git a/src/openrct2/ride/thrill/Enterprise.cpp b/src/openrct2/ride/thrill/Enterprise.cpp index 3d77df341c..962cd18049 100644 --- a/src/openrct2/ride/thrill/Enterprise.cpp +++ b/src/openrct2/ride/thrill/Enterprise.cpp @@ -20,7 +20,7 @@ #include "../Vehicle.h" static void PaintEnterpriseRiders( - PaintSession& session, const rct_ride_entry& rideEntry, Vehicle& vehicle, uint32_t imageOffset, const CoordsXYZ& offset, + PaintSession& session, const RideObjectEntry& rideEntry, Vehicle& vehicle, uint32_t imageOffset, const CoordsXYZ& offset, const BoundBoxXYZ& bb) { if (session.DPI.zoom_level > ZoomLevel{ 0 }) diff --git a/src/openrct2/ride/thrill/MagicCarpet.cpp b/src/openrct2/ride/thrill/MagicCarpet.cpp index b8a557889c..f2b10255c1 100644 --- a/src/openrct2/ride/thrill/MagicCarpet.cpp +++ b/src/openrct2/ride/thrill/MagicCarpet.cpp @@ -97,7 +97,7 @@ static Vehicle* GetFirstVehicle(const Ride& ride) } static void PaintMagicCarpetRiders( - PaintSession& session, const rct_ride_entry& rideEntry, const Vehicle& vehicle, Direction direction, + PaintSession& session, const RideObjectEntry& rideEntry, const Vehicle& vehicle, Direction direction, const CoordsXYZ& offset, const BoundBoxXYZ& bb) { if (session.DPI.zoom_level > ZoomLevel{ 1 }) diff --git a/src/openrct2/ride/thrill/SwingingInverterShip.cpp b/src/openrct2/ride/thrill/SwingingInverterShip.cpp index 2a4ca0a24a..0a12a37260 100644 --- a/src/openrct2/ride/thrill/SwingingInverterShip.cpp +++ b/src/openrct2/ride/thrill/SwingingInverterShip.cpp @@ -61,7 +61,7 @@ static constexpr const uint32_t SwingingInverterShipFrameSprites[] = { static void PaintSwingingInverterShipStructure( PaintSession& session, const Ride& ride, uint8_t direction, int8_t axisOffset, uint16_t height) { - rct_ride_entry* rideEntry = GetRideEntryByIndex(ride.subtype); + RideObjectEntry* rideEntry = GetRideEntryByIndex(ride.subtype); if (rideEntry == nullptr) return; diff --git a/src/openrct2/ride/thrill/SwingingShip.cpp b/src/openrct2/ride/thrill/SwingingShip.cpp index 90084c69fd..d96d240ba8 100644 --- a/src/openrct2/ride/thrill/SwingingShip.cpp +++ b/src/openrct2/ride/thrill/SwingingShip.cpp @@ -86,7 +86,7 @@ static void PaintSwingingShipRiders( static void PaintSwingingShipStructure( PaintSession& session, const Ride& ride, uint8_t direction, int8_t axisOffset, uint16_t height) { - rct_ride_entry* rideEntry = GetRideEntryByIndex(ride.subtype); + RideObjectEntry* rideEntry = GetRideEntryByIndex(ride.subtype); if (rideEntry == nullptr) return; diff --git a/src/openrct2/ride/thrill/TopSpin.cpp b/src/openrct2/ride/thrill/TopSpin.cpp index 9352f5e483..63f7c99774 100644 --- a/src/openrct2/ride/thrill/TopSpin.cpp +++ b/src/openrct2/ride/thrill/TopSpin.cpp @@ -59,7 +59,7 @@ static void PaintTopSpinRiders( } static void PaintTopSpinSeat( - PaintSession& session, const Ride& ride, const rct_ride_entry& rideEntry, const Vehicle* vehicle, Direction direction, + PaintSession& session, const Ride& ride, const RideObjectEntry& rideEntry, const Vehicle* vehicle, Direction direction, uint32_t armRotation, uint32_t seatRotation, const CoordsXYZ& offset, const BoundBoxXYZ& bb) { if (armRotation >= std::size(TopSpinSeatHeightOffset)) diff --git a/src/openrct2/ride/thrill/Twist.cpp b/src/openrct2/ride/thrill/Twist.cpp index 61f6bffd3b..75323d4fc0 100644 --- a/src/openrct2/ride/thrill/Twist.cpp +++ b/src/openrct2/ride/thrill/Twist.cpp @@ -23,7 +23,7 @@ static void PaintTwistStructure( PaintSession& session, const Ride& ride, uint8_t direction, int8_t xOffset, int8_t yOffset, uint16_t height) { - rct_ride_entry* rideEntry = GetRideEntryByIndex(ride.subtype); + RideObjectEntry* rideEntry = GetRideEntryByIndex(ride.subtype); Vehicle* vehicle = nullptr; if (rideEntry == nullptr) diff --git a/src/openrct2/scenario/ScenarioRepository.cpp b/src/openrct2/scenario/ScenarioRepository.cpp index 893d021520..9476c38092 100644 --- a/src/openrct2/scenario/ScenarioRepository.cpp +++ b/src/openrct2/scenario/ScenarioRepository.cpp @@ -115,7 +115,7 @@ static int32_t ScenarioIndexEntryCompareByIndex(const scenario_index_entry& entr } } -static void ScenarioHighscoreFree(scenario_highscore_entry* highscore) +static void ScenarioHighscoreFree(ScenarioHighscoreEntry* highscore) { SafeFree(highscore->fileName); SafeFree(highscore->name); @@ -301,7 +301,7 @@ private: String::Set(entry.details, sizeof(entry.details), s6Info->details); // Look up and store information regarding the origins of this scenario. - source_desc desc; + SourceDescriptor desc; if (ScenarioSources::TryGetByName(entry.name, &desc)) { entry.sc_id = desc.id; @@ -336,7 +336,7 @@ private: std::shared_ptr const _env; ScenarioFileIndex const _fileIndex; std::vector _scenarios; - std::vector _highscores; + std::vector _highscores; public: explicit ScenarioRepository(const std::shared_ptr& env) @@ -458,7 +458,7 @@ public: if (scenario != nullptr) { // Check if record company value has been broken or the highscore is the same but no name is registered - scenario_highscore_entry* highscore = scenario->highscore; + ScenarioHighscoreEntry* highscore = scenario->highscore; if (highscore == nullptr || companyValue > highscore->company_value || (String::IsNullOrEmpty(highscore->name) && companyValue == highscore->company_value)) { @@ -617,7 +617,7 @@ private: uint32_t numHighscores = fs.ReadValue(); for (uint32_t i = 0; i < numHighscores; i++) { - scenario_highscore_entry* highscore = InsertHighscore(); + ScenarioHighscoreEntry* highscore = InsertHighscore(); highscore->fileName = fs.ReadString(); highscore->name = fs.ReadString(); highscore->company_value = fileVersion == 1 ? fs.ReadValue() : fs.ReadValue(); @@ -690,7 +690,7 @@ private: } if (notFound) { - scenario_highscore_entry* highscore = InsertHighscore(); + ScenarioHighscoreEntry* highscore = InsertHighscore(); highscore->fileName = String::Duplicate(scBasic.Path); std::string name = RCT2StringToUTF8(scBasic.CompletedBy, RCT2LanguageId::EnglishUK); highscore->name = String::Duplicate(name.c_str()); @@ -720,10 +720,10 @@ private: _highscores.clear(); } - scenario_highscore_entry* InsertHighscore() + ScenarioHighscoreEntry* InsertHighscore() { - auto highscore = new scenario_highscore_entry(); - std::memset(highscore, 0, sizeof(scenario_highscore_entry)); + auto highscore = new ScenarioHighscoreEntry(); + std::memset(highscore, 0, sizeof(ScenarioHighscoreEntry)); _highscores.push_back(highscore); return highscore; } @@ -750,7 +750,7 @@ private: fs.WriteValue(static_cast(_highscores.size())); for (size_t i = 0; i < _highscores.size(); i++) { - const scenario_highscore_entry* highscore = _highscores[i]; + const ScenarioHighscoreEntry* highscore = _highscores[i]; fs.WriteString(highscore->fileName); fs.WriteString(highscore->name); fs.WriteValue(highscore->company_value); diff --git a/src/openrct2/scenario/ScenarioRepository.h b/src/openrct2/scenario/ScenarioRepository.h index 5c2ad4caa0..de4221ab63 100644 --- a/src/openrct2/scenario/ScenarioRepository.h +++ b/src/openrct2/scenario/ScenarioRepository.h @@ -16,7 +16,7 @@ struct RCTObjectEntry; -struct scenario_highscore_entry +struct ScenarioHighscoreEntry { utf8* fileName; utf8* name; @@ -54,7 +54,7 @@ struct scenario_index_entry uint8_t objective_arg_1; int64_t objective_arg_2; int16_t objective_arg_3; - scenario_highscore_entry* highscore = nullptr; + ScenarioHighscoreEntry* highscore = nullptr; utf8 internal_name[64]; // Untranslated name utf8 name[64]; // Translated name diff --git a/src/openrct2/scenario/ScenarioSources.cpp b/src/openrct2/scenario/ScenarioSources.cpp index 74ed5113c5..bc0f3e7c78 100644 --- a/src/openrct2/scenario/ScenarioSources.cpp +++ b/src/openrct2/scenario/ScenarioSources.cpp @@ -358,7 +358,7 @@ namespace ScenarioSources #pragma endregion - bool TryGetByName(const utf8* name, source_desc* outDesc) + bool TryGetByName(const utf8* name, SourceDescriptor* outDesc) { Guard::ArgumentNotNull(outDesc, GUARD_LINE); @@ -389,7 +389,7 @@ namespace ScenarioSources return false; } - bool TryGetById(uint8_t id, source_desc* outDesc) + bool TryGetById(uint8_t id, SourceDescriptor* outDesc) { Guard::ArgumentNotNull(outDesc, GUARD_LINE); diff --git a/src/openrct2/scenario/ScenarioSources.h b/src/openrct2/scenario/ScenarioSources.h index 066a576cbe..9370ea987c 100644 --- a/src/openrct2/scenario/ScenarioSources.h +++ b/src/openrct2/scenario/ScenarioSources.h @@ -12,7 +12,7 @@ #include "../common.h" #include "../core/String.hpp" -struct source_desc +struct SourceDescriptor { const utf8* title; uint8_t id; @@ -23,8 +23,8 @@ struct source_desc namespace ScenarioSources { - bool TryGetByName(const utf8* name, source_desc* outDesc); - bool TryGetById(uint8_t id, source_desc* outDesc); + bool TryGetByName(const utf8* name, SourceDescriptor* outDesc); + bool TryGetById(uint8_t id, SourceDescriptor* outDesc); void NormaliseName(utf8* buffer, size_t bufferSize, const utf8* name); } // namespace ScenarioSources diff --git a/src/openrct2/scripting/bindings/object/ScObject.hpp b/src/openrct2/scripting/bindings/object/ScObject.hpp index 283eec5976..20a50d1250 100644 --- a/src/openrct2/scripting/bindings/object/ScObject.hpp +++ b/src/openrct2/scripting/bindings/object/ScObject.hpp @@ -478,7 +478,7 @@ namespace OpenRCT2::Scripting auto obj = GetObject(); if (obj != nullptr) { - auto rideEntry = static_cast(obj->GetLegacyData()); + auto rideEntry = static_cast(obj->GetLegacyData()); if (rideEntry != nullptr && _vehicleIndex < std::size(rideEntry->Cars)) { return rideEntry->GetCar(_vehicleIndex); @@ -758,12 +758,12 @@ namespace OpenRCT2::Scripting return static_cast(ScObject::GetObject()); } - const rct_ride_entry* GetLegacyData() const + const RideObjectEntry* GetLegacyData() const { auto obj = GetObject(); if (obj != nullptr) { - return static_cast(obj->GetLegacyData()); + return static_cast(obj->GetLegacyData()); } return nullptr; } diff --git a/src/openrct2/scripting/bindings/ride/ScTrackIterator.cpp b/src/openrct2/scripting/bindings/ride/ScTrackIterator.cpp index fe103a5b41..c797ac7639 100644 --- a/src/openrct2/scripting/bindings/ride/ScTrackIterator.cpp +++ b/src/openrct2/scripting/bindings/ride/ScTrackIterator.cpp @@ -80,7 +80,7 @@ DukValue ScTrackIterator::previousPosition_get() const return ToDuk(ctx, nullptr); auto posEl = CoordsXYE(pos.x, pos.y, reinterpret_cast(el)); - track_begin_end tbe{}; + TrackBeginEnd tbe{}; TrackBlockGetPrevious(posEl, &tbe); CoordsXYZD result(tbe.end_x, tbe.end_y, tbe.begin_z, tbe.begin_direction); return ToDuk(ctx, result); @@ -119,7 +119,7 @@ bool ScTrackIterator::previous() return false; auto posEl = CoordsXYE(pos.x, pos.y, reinterpret_cast(el)); - track_begin_end tbe{}; + TrackBeginEnd tbe{}; if (TrackBlockGetPrevious(posEl, &tbe)) { auto prev = CoordsXYE(tbe.end_x, tbe.end_y, tbe.begin_element); diff --git a/src/openrct2/util/SawyerCoding.cpp b/src/openrct2/util/SawyerCoding.cpp index 9a133d5863..409cf34e17 100644 --- a/src/openrct2/util/SawyerCoding.cpp +++ b/src/openrct2/util/SawyerCoding.cpp @@ -39,24 +39,24 @@ uint32_t SawyerCodingCalculateChecksum(const uint8_t* buffer, size_t length) * rct2: 0x006762E1 * */ -size_t SawyerCodingWriteChunkBuffer(uint8_t* dst_file, const uint8_t* buffer, sawyercoding_chunk_header chunkHeader) +size_t SawyerCodingWriteChunkBuffer(uint8_t* dst_file, const uint8_t* buffer, SawyerCodingChunkHeader chunkHeader) { uint8_t *encode_buffer, *encode_buffer2; switch (chunkHeader.encoding) { case CHUNK_ENCODING_NONE: - std::memcpy(dst_file, &chunkHeader, sizeof(sawyercoding_chunk_header)); - dst_file += sizeof(sawyercoding_chunk_header); + std::memcpy(dst_file, &chunkHeader, sizeof(SawyerCodingChunkHeader)); + dst_file += sizeof(SawyerCodingChunkHeader); std::memcpy(dst_file, buffer, chunkHeader.length); - // fwrite(&chunkHeader, sizeof(sawyercoding_chunk_header), 1, file); + // fwrite(&chunkHeader, sizeof(SawyerCodingChunkHeader), 1, file); // fwrite(buffer, 1, chunkHeader.length, file); break; case CHUNK_ENCODING_RLE: encode_buffer = static_cast(malloc(0x600000)); chunkHeader.length = static_cast(EncodeChunkRLE(buffer, encode_buffer, chunkHeader.length)); - std::memcpy(dst_file, &chunkHeader, sizeof(sawyercoding_chunk_header)); - dst_file += sizeof(sawyercoding_chunk_header); + std::memcpy(dst_file, &chunkHeader, sizeof(SawyerCodingChunkHeader)); + dst_file += sizeof(SawyerCodingChunkHeader); std::memcpy(dst_file, encode_buffer, chunkHeader.length); free(encode_buffer); @@ -66,8 +66,8 @@ size_t SawyerCodingWriteChunkBuffer(uint8_t* dst_file, const uint8_t* buffer, sa encode_buffer2 = static_cast(malloc(0x600000)); chunkHeader.length = static_cast(EncodeChunkRepeat(buffer, encode_buffer, chunkHeader.length)); chunkHeader.length = static_cast(EncodeChunkRLE(encode_buffer, encode_buffer2, chunkHeader.length)); - std::memcpy(dst_file, &chunkHeader, sizeof(sawyercoding_chunk_header)); - dst_file += sizeof(sawyercoding_chunk_header); + std::memcpy(dst_file, &chunkHeader, sizeof(SawyerCodingChunkHeader)); + dst_file += sizeof(SawyerCodingChunkHeader); std::memcpy(dst_file, encode_buffer2, chunkHeader.length); free(encode_buffer2); @@ -77,15 +77,15 @@ size_t SawyerCodingWriteChunkBuffer(uint8_t* dst_file, const uint8_t* buffer, sa encode_buffer = static_cast(malloc(chunkHeader.length)); std::memcpy(encode_buffer, buffer, chunkHeader.length); EncodeChunkRotate(encode_buffer, chunkHeader.length); - std::memcpy(dst_file, &chunkHeader, sizeof(sawyercoding_chunk_header)); - dst_file += sizeof(sawyercoding_chunk_header); + std::memcpy(dst_file, &chunkHeader, sizeof(SawyerCodingChunkHeader)); + dst_file += sizeof(SawyerCodingChunkHeader); std::memcpy(dst_file, encode_buffer, chunkHeader.length); free(encode_buffer); break; } - return chunkHeader.length + sizeof(sawyercoding_chunk_header); + return chunkHeader.length + sizeof(SawyerCodingChunkHeader); } size_t SawyerCodingDecodeSV4(const uint8_t* src, uint8_t* dst, size_t length, size_t bufferLength) diff --git a/src/openrct2/util/SawyerCoding.h b/src/openrct2/util/SawyerCoding.h index e5bce4adf5..3723e39617 100644 --- a/src/openrct2/util/SawyerCoding.h +++ b/src/openrct2/util/SawyerCoding.h @@ -12,12 +12,12 @@ #include "../common.h" #pragma pack(push, 1) -struct sawyercoding_chunk_header +struct SawyerCodingChunkHeader { uint8_t encoding; uint32_t length; }; -assert_struct_size(sawyercoding_chunk_header, 5); +assert_struct_size(SawyerCodingChunkHeader, 5); #pragma pack(pop) enum @@ -42,7 +42,7 @@ enum }; uint32_t SawyerCodingCalculateChecksum(const uint8_t* buffer, size_t length); -size_t SawyerCodingWriteChunkBuffer(uint8_t* dst_file, const uint8_t* src_buffer, sawyercoding_chunk_header chunkHeader); +size_t SawyerCodingWriteChunkBuffer(uint8_t* dst_file, const uint8_t* src_buffer, SawyerCodingChunkHeader chunkHeader); size_t SawyerCodingDecodeSV4(const uint8_t* src, uint8_t* dst, size_t length, size_t bufferLength); size_t SawyerCodingDecodeSC4(const uint8_t* src, uint8_t* dst, size_t length, size_t bufferLength); size_t SawyerCodingEencodeSV4(const uint8_t* src, uint8_t* dst, size_t length); diff --git a/src/openrct2/world/Map.cpp b/src/openrct2/world/Map.cpp index c3d7694823..d9bcf89967 100644 --- a/src/openrct2/world/Map.cpp +++ b/src/openrct2/world/Map.cpp @@ -1764,7 +1764,7 @@ SmallSceneryElement* MapGetSmallSceneryElementAt(const CoordsXYZ& sceneryCoords, std::optional MapLargeSceneryGetOrigin( const CoordsXYZD& sceneryPos, int32_t sequence, LargeSceneryElement** outElement) { - rct_large_scenery_tile* tile; + LargeSceneryTile* tile; auto tileElement = MapGetLargeScenerySegment(sceneryPos, sequence); if (tileElement == nullptr) @@ -1790,7 +1790,7 @@ std::optional MapLargeSceneryGetOrigin( bool MapLargeScenerySignSetColour(const CoordsXYZD& signPos, int32_t sequence, uint8_t mainColour, uint8_t textColour) { LargeSceneryElement* tileElement; - rct_large_scenery_tile *sceneryTiles, *tile; + LargeSceneryTile *sceneryTiles, *tile; auto sceneryOrigin = MapLargeSceneryGetOrigin(signPos, sequence, &tileElement); if (!sceneryOrigin) diff --git a/src/openrct2/world/Scenery.cpp b/src/openrct2/world/Scenery.cpp index 42350c4a7b..d862d5b696 100644 --- a/src/openrct2/world/Scenery.cpp +++ b/src/openrct2/world/Scenery.cpp @@ -65,7 +65,7 @@ const CoordsXY SceneryQuadrantOffsets[] = { { 24, 8 }, }; -LargeSceneryText::LargeSceneryText(const rct_large_scenery_text& original) +LargeSceneryText::LargeSceneryText(const RCTLargeSceneryText& original) { for (size_t i = 0; i < std::size(original.offset); i++) { @@ -81,7 +81,7 @@ LargeSceneryText::LargeSceneryText(const rct_large_scenery_text& original) } } -const rct_large_scenery_text_glyph* LargeSceneryText::GetGlyph(char32_t codepoint) const +const LargeSceneryTextGlyph* LargeSceneryText::GetGlyph(char32_t codepoint) const { if (codepoint >= std::size(glyphs)) { @@ -90,7 +90,7 @@ const rct_large_scenery_text_glyph* LargeSceneryText::GetGlyph(char32_t codepoin return &glyphs[codepoint]; } -const rct_large_scenery_text_glyph& LargeSceneryText::GetGlyph(char32_t codepoint, char32_t defaultCodepoint) const +const LargeSceneryTextGlyph& LargeSceneryText::GetGlyph(char32_t codepoint, char32_t defaultCodepoint) const { auto glyph = GetGlyph(codepoint); if (glyph == nullptr) @@ -331,14 +331,14 @@ PathBitEntry* GetFootpathItemEntry(ObjectEntryIndex entryIndex) return result; } -rct_scenery_group_entry* GetSceneryGroupEntry(ObjectEntryIndex entryIndex) +SceneryGroupEntry* GetSceneryGroupEntry(ObjectEntryIndex entryIndex) { - rct_scenery_group_entry* result = nullptr; + SceneryGroupEntry* result = nullptr; auto& objMgr = OpenRCT2::GetContext()->GetObjectManager(); auto obj = objMgr.GetLoadedObject(ObjectType::SceneryGroup, entryIndex); if (obj != nullptr) { - result = static_cast(obj->GetLegacyData()); + result = static_cast(obj->GetLegacyData()); } return result; } diff --git a/src/openrct2/world/Scenery.h b/src/openrct2/world/Scenery.h index 65ddf4c4ef..4f652287d2 100644 --- a/src/openrct2/world/Scenery.h +++ b/src/openrct2/world/Scenery.h @@ -30,7 +30,7 @@ struct SceneryEntryBase uint32_t image; }; -struct rct_large_scenery_tile +struct LargeSceneryTile { int16_t x_offset; int16_t y_offset; @@ -46,7 +46,7 @@ enum LARGE_SCENERY_TILE_FLAG_ALLOW_SUPPORTS_ABOVE = 0x40, }; -struct rct_large_scenery_text_glyph +struct LargeSceneryTextGlyph { uint8_t image_offset; uint8_t width; @@ -54,17 +54,18 @@ struct rct_large_scenery_text_glyph uint8_t pad_3; }; -struct rct_large_scenery_text +// TODO: Remove not required +struct RCTLargeSceneryText { struct { int16_t x, y; - } offset[2]; // 0x0 - uint16_t max_width; // 0x8 - uint16_t pad_A; // 0xA - uint8_t flags; // 0xC - uint8_t num_images; // 0xD - rct_large_scenery_text_glyph glyphs[256]; // 0xE + } offset[2]; // 0x0 + uint16_t max_width; // 0x8 + uint16_t pad_A; // 0xA + uint8_t flags; // 0xC + uint8_t num_images; // 0xD + LargeSceneryTextGlyph glyphs[256]; // 0xE }; enum LARGE_SCENERY_TEXT_FLAGS @@ -79,7 +80,7 @@ struct LargeSceneryEntry : SceneryEntryBase uint8_t flags; money32 price; money32 removal_price; - rct_large_scenery_tile* tiles; + LargeSceneryTile* tiles; ObjectEntryIndex scenery_tab_id; uint8_t scrolling_mode; LargeSceneryText* text; @@ -174,17 +175,17 @@ struct LargeSceneryText uint16_t max_width; uint8_t flags; uint16_t num_images; - rct_large_scenery_text_glyph glyphs[256]; + LargeSceneryTextGlyph glyphs[256]; LargeSceneryText() = default; - explicit LargeSceneryText(const rct_large_scenery_text& original); - const rct_large_scenery_text_glyph* GetGlyph(char32_t codepoint) const; - const rct_large_scenery_text_glyph& GetGlyph(char32_t codepoint, char32_t defaultCodepoint) const; + explicit LargeSceneryText(const RCTLargeSceneryText& original); + const LargeSceneryTextGlyph* GetGlyph(char32_t codepoint) const; + const LargeSceneryTextGlyph& GetGlyph(char32_t codepoint, char32_t defaultCodepoint) const; int32_t MeasureWidth(std::string_view text) const; int32_t MeasureHeight(std::string_view text) const; }; -struct rct_scenery_group_entry +struct SceneryGroupEntry { StringId name; uint32_t image; @@ -278,7 +279,7 @@ void SceneryRemoveGhostToolPlacement(); WallSceneryEntry* GetWallEntry(ObjectEntryIndex entryIndex); BannerSceneryEntry* GetBannerEntry(ObjectEntryIndex entryIndex); PathBitEntry* GetFootpathItemEntry(ObjectEntryIndex entryIndex); -rct_scenery_group_entry* GetSceneryGroupEntry(ObjectEntryIndex entryIndex); +SceneryGroupEntry* GetSceneryGroupEntry(ObjectEntryIndex entryIndex); int32_t WallEntryGetDoorSound(const WallSceneryEntry* wallEntry); diff --git a/test/tests/SawyerCodingTest.cpp b/test/tests/SawyerCodingTest.cpp index fa7dc628d5..83fd71cc18 100644 --- a/test/tests/SawyerCodingTest.cpp +++ b/test/tests/SawyerCodingTest.cpp @@ -34,13 +34,13 @@ protected: void TestEncodeDecode(uint8_t encoding_type) { // Encode - sawyercoding_chunk_header chdr_in; + SawyerCodingChunkHeader chdr_in; chdr_in.encoding = encoding_type; chdr_in.length = sizeof(randomdata); uint8_t* encodedDataBuffer = new uint8_t[BUFFER_SIZE]; size_t encodedDataSize = SawyerCodingWriteChunkBuffer( encodedDataBuffer, reinterpret_cast(randomdata), chdr_in); - ASSERT_GT(encodedDataSize, sizeof(sawyercoding_chunk_header)); + ASSERT_GT(encodedDataSize, sizeof(SawyerCodingChunkHeader)); // Decode OpenRCT2::MemoryStream ms(encodedDataBuffer, encodedDataSize); @@ -56,8 +56,8 @@ protected: void TestDecode(const uint8_t* data, size_t size) { - auto expectedLength = size - sizeof(sawyercoding_chunk_header); - auto chdr_in = reinterpret_cast(data); + auto expectedLength = size - sizeof(SawyerCodingChunkHeader); + auto chdr_in = reinterpret_cast(data); ASSERT_EQ(chdr_in->length, expectedLength); OpenRCT2::MemoryStream ms(data, size);