mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Remove now-redundant code in WaterCoaster.cpp 

More consolidation is possible (by making JuniorRollerCoaster.cpp use a template like BolligerMabillardTrack.hpp), but probably best left for another PR.
This commit is contained in:
Gymnasiast 2023-12-13 23:03:38 +01:00
parent 5e38c15f58
commit a19250c5be
No known key found for this signature in database
GPG Key ID: DBFFF47AB2CA3EDD
1 changed files with 1 additions and 96 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

97
src/openrct2/ride/water/WaterCoaster.cpp
View File

@ -398,101 +398,6 @@ TRACK_PAINT_FUNCTION GetTrackPaintFunctionWaterRC(int32_t trackType)
return WaterRCTrackDiag25DegDownTo60DegDown;
case TrackElemType::DiagDown60ToDown25:
return WaterRCTrackDiag60DegDownTo25DegDown;
//////////////////////////////////////////////////////
// Use Junior RC
//////////////////////////////////////////////////////
case TrackElemType::LeftQuarterTurn5Tiles:
case TrackElemType::RightQuarterTurn5Tiles:
case TrackElemType::FlatToLeftBank:
case TrackElemType::FlatToRightBank:
case TrackElemType::LeftBankToFlat:
case TrackElemType::RightBankToFlat:
case TrackElemType::BankedLeftQuarterTurn5Tiles:
case TrackElemType::BankedRightQuarterTurn5Tiles:
case TrackElemType::LeftBankToUp25:
case TrackElemType::RightBankToUp25:
case TrackElemType::Up25ToLeftBank:
case TrackElemType::Up25ToRightBank:
case TrackElemType::LeftBankToDown25:
case TrackElemType::RightBankToDown25:
case TrackElemType::Down25ToLeftBank:
case TrackElemType::Down25ToRightBank:
case TrackElemType::LeftBank:
case TrackElemType::RightBank:
case TrackElemType::SBendLeft:
case TrackElemType::SBendRight:
case TrackElemType::LeftQuarterTurn3Tiles:
case TrackElemType::RightQuarterTurn3Tiles:
case TrackElemType::LeftBankedQuarterTurn3Tiles:
case TrackElemType::RightBankedQuarterTurn3Tiles:
case TrackElemType::FlatToUp60:
case TrackElemType::Up60ToFlat:
case TrackElemType::FlatToDown60:
case TrackElemType::Down60ToFlat:
case TrackElemType::LeftHalfBankedHelixUpSmall:
case TrackElemType::RightHalfBankedHelixUpSmall:
case TrackElemType::LeftHalfBankedHelixDownSmall:
case TrackElemType::RightHalfBankedHelixDownSmall:
case TrackElemType::LeftHalfBankedHelixUpLarge:
case TrackElemType::RightHalfBankedHelixUpLarge:
case TrackElemType::LeftHalfBankedHelixDownLarge:
case TrackElemType::RightHalfBankedHelixDownLarge:
case TrackElemType::Brakes:
case TrackElemType::LeftEighthToDiag:
case TrackElemType::RightEighthToDiag:
case TrackElemType::LeftEighthToOrthogonal:
case TrackElemType::RightEighthToOrthogonal:
case TrackElemType::LeftEighthBankToDiag:
case TrackElemType::RightEighthBankToDiag:
case TrackElemType::LeftEighthBankToOrthogonal:
case TrackElemType::RightEighthBankToOrthogonal:
case TrackElemType::DiagFlatToLeftBank:
case TrackElemType::DiagFlatToRightBank:
case TrackElemType::DiagLeftBankToFlat:
case TrackElemType::DiagRightBankToFlat:
case TrackElemType::DiagLeftBankToUp25:
case TrackElemType::DiagRightBankToUp25:
case TrackElemType::DiagUp25ToLeftBank:
case TrackElemType::DiagUp25ToRightBank:
case TrackElemType::DiagLeftBankToDown25:
case TrackElemType::DiagRightBankToDown25:
case TrackElemType::DiagDown25ToLeftBank:
case TrackElemType::DiagDown25ToRightBank:
case TrackElemType::DiagLeftBank:
case TrackElemType::DiagRightBank:
case TrackElemType::BlockBrakes:
case TrackElemType::Booster:
return GetTrackPaintFunctionJuniorRC(trackType);
//////////////////////////////////////////////////////
// Use River Rafts
//////////////////////////////////////////////////////
case TrackElemType::FlatCovered:
return GetTrackPaintFunctionSplashBoats(TrackElemType::Flat);
case TrackElemType::LeftQuarterTurn5TilesCovered:
return GetTrackPaintFunctionSplashBoats(TrackElemType::LeftQuarterTurn5Tiles);
case TrackElemType::RightQuarterTurn5TilesCovered:
return GetTrackPaintFunctionSplashBoats(TrackElemType::RightQuarterTurn5Tiles);
case TrackElemType::SBendLeftCovered:
return GetTrackPaintFunctionSplashBoats(TrackElemType::SBendLeft);
case TrackElemType::SBendRightCovered:
return GetTrackPaintFunctionSplashBoats(TrackElemType::SBendRight);
case TrackElemType::FlatToDown25Covered:
return GetTrackPaintFunctionSplashBoats(TrackElemType::FlatToDown25);
case TrackElemType::Down25Covered:
return GetTrackPaintFunctionSplashBoats(TrackElemType::Down25);
case TrackElemType::Down25ToDown60Covered:
return GetTrackPaintFunctionSplashBoats(TrackElemType::Down25ToDown60);
case TrackElemType::Down60Covered:
return GetTrackPaintFunctionSplashBoats(TrackElemType::Down60);
case TrackElemType::Down60ToDown25Covered:
return GetTrackPaintFunctionSplashBoats(TrackElemType::Down60ToDown25);
case TrackElemType::Down25ToFlatCovered:
return GetTrackPaintFunctionSplashBoats(TrackElemType::Down25ToFlat);
case TrackElemType::OnRidePhoto:
return GetTrackPaintFunctionJuniorRC(trackType);
}
return nullptr;
return GetTrackPaintFunctionJuniorRC(trackType);
}