mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2025-12-16 20:42:40 +01:00
Code Issues Releases Wiki Activity

Sanity checks for RCT1 SC4 import (#3551)

Browse Source
This commit is contained in:
janisozaur
2016-05-09 20:13:21 +02:00
committed by Ted John
parent 8d0481deba
commit d7a51aadee
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/rct1/S4Importer.cpp
View File

@@ -329,6 +329,7 @@ void S4Importer::AddAvailableEntriesFromSceneryGroups()
void S4Importer::AddEntryForRideType(uint8 rideType) void S4Importer::AddEntryForRideType(uint8 rideType)
{ {
assert(rideType < Util::CountOf(_rideTypeToRideEntryMap));
if (_rideTypeToRideEntryMap[rideType] == 255) if (_rideTypeToRideEntryMap[rideType] == 255)
{ {
const char * entryName = RCT1::GetRideTypeObject(rideType); const char * entryName = RCT1::GetRideTypeObject(rideType);
@@ -339,6 +340,7 @@ void S4Importer::AddEntryForRideType(uint8 rideType)
void S4Importer::AddEntryForVehicleType(uint8 rideType, uint8 vehicleType) void S4Importer::AddEntryForVehicleType(uint8 rideType, uint8 vehicleType)
{ {
assert(vehicleType < Util::CountOf(_vehicleTypeToRideEntryMap));
if (_vehicleTypeToRideEntryMap[vehicleType] == 255) if (_vehicleTypeToRideEntryMap[vehicleType] == 255)
{ {
const char * entryName = RCT1::GetVehicleObject(vehicleType); const char * entryName = RCT1::GetVehicleObject(vehicleType);
@@ -354,6 +356,7 @@ void S4Importer::AddEntryForVehicleType(uint8 rideType, uint8 vehicleType)
void S4Importer::AddEntryForSmallScenery(uint8 smallSceneryType) void S4Importer::AddEntryForSmallScenery(uint8 smallSceneryType)
{ {
assert(smallSceneryType < Util::CountOf(_smallSceneryTypeToEntryMap));
if (_smallSceneryTypeToEntryMap[smallSceneryType] == 255) if (_smallSceneryTypeToEntryMap[smallSceneryType] == 255)
{ {
const char * entryName = RCT1::GetSmallSceneryObject(smallSceneryType); const char * entryName = RCT1::GetSmallSceneryObject(smallSceneryType);
@@ -364,6 +367,7 @@ void S4Importer::AddEntryForSmallScenery(uint8 smallSceneryType)
void S4Importer::AddEntryForLargeScenery(uint8 largeSceneryType) void S4Importer::AddEntryForLargeScenery(uint8 largeSceneryType)
{ {
assert(largeSceneryType < Util::CountOf(_largeSceneryTypeToEntryMap));
if (_largeSceneryTypeToEntryMap[largeSceneryType] == 255) if (_largeSceneryTypeToEntryMap[largeSceneryType] == 255)
{ {
const char * entryName = RCT1::GetLargeSceneryObject(largeSceneryType); const char * entryName = RCT1::GetLargeSceneryObject(largeSceneryType);
@@ -374,6 +378,7 @@ void S4Importer::AddEntryForLargeScenery(uint8 largeSceneryType)
void S4Importer::AddEntryForWall(uint8 wallType) void S4Importer::AddEntryForWall(uint8 wallType)
{ {
assert(wallType < Util::CountOf(_wallTypeToEntryMap));
if (_wallTypeToEntryMap[wallType] == 255) if (_wallTypeToEntryMap[wallType] == 255)
{ {
const char * entryName = RCT1::GetWallObject(wallType); const char * entryName = RCT1::GetWallObject(wallType);
@@ -384,6 +389,7 @@ void S4Importer::AddEntryForWall(uint8 wallType)
void S4Importer::AddEntryForPath(uint8 pathType) void S4Importer::AddEntryForPath(uint8 pathType)
{ {
assert(pathType < Util::CountOf(_pathTypeToEntryMap));
if (_pathTypeToEntryMap[pathType] == 255) if (_pathTypeToEntryMap[pathType] == 255)
{ {
const char * entryName = RCT1::GetPathObject(pathType); const char * entryName = RCT1::GetPathObject(pathType);