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

Fix #4334: Some SV4 files fail to load 

- Ride entries are now re-used where objects are the same.
- Number of scenery groups is now safely limited to 19, the maximum RCT2 supports.
This commit is contained in:
Ted John 2016-09-06 18:43:01 +01:00
parent eccea88388
commit d6a3b1e093
1 changed files with 33 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
src/rct1/S4Importer.cpp
View File

@ -16,6 +16,7 @@
#include "S4Importer.h" #include "S4Importer.h"
#include "../core/Console.hpp"
#include "../core/Exception.hpp" #include "../core/Exception.hpp"
#include "../core/Guard.hpp" #include "../core/Guard.hpp"
#include "../core/List.hpp" #include "../core/List.hpp"
@ -337,8 +338,14 @@ void S4Importer::AddEntryForRideType(uint8 rideType)
if (_rideTypeToRideEntryMap[rideType] == 255) if (_rideTypeToRideEntryMap[rideType] == 255)
{ {
const char * entryName = RCT1::GetRideTypeObject(rideType); const char * entryName = RCT1::GetRideTypeObject(rideType);
_rideTypeToRideEntryMap[rideType] = (uint8)_rideEntries.GetCount();
_rideEntries.Add(entryName); size_t entryIndex = _rideEntries.IndexOf(entryName, ObjectNameComparer);
if (entryIndex == SIZE_MAX)
{
entryIndex = _rideEntries.GetCount();
_rideEntries.Add(entryName);
}
_rideTypeToRideEntryMap[rideType] = (uint8)entryIndex;
} }
} }
@ -349,12 +356,14 @@ void S4Importer::AddEntryForVehicleType(uint8 rideType, uint8 vehicleType)
{ {
const char * entryName = RCT1::GetVehicleObject(vehicleType); const char * entryName = RCT1::GetVehicleObject(vehicleType);
uint8 rideEntryIndex = (uint8)_rideEntries.GetCount(); size_t entryIndex = _rideEntries.IndexOf(entryName, ObjectNameComparer);
_vehicleTypeToRideEntryMap[vehicleType] = rideEntryIndex; if (entryIndex == SIZE_MAX)
_rideEntries.Add(entryName); {
entryIndex = _rideEntries.GetCount();
// Just overwrite this with the vehicle entry for now... _rideEntries.Add(entryName);
_rideTypeToRideEntryMap[rideType] = rideEntryIndex; }
_vehicleTypeToRideEntryMap[vehicleType] = (uint8)entryIndex;
_rideTypeToRideEntryMap[rideType] = (uint8)entryIndex;
} }
} }
@ -440,9 +449,17 @@ void S4Importer::AddEntriesForSceneryTheme(uint8 sceneryThemeType)
else else
{ {
const char * entryName = RCT1::GetSceneryGroupObject(sceneryThemeType); const char * entryName = RCT1::GetSceneryGroupObject(sceneryThemeType);
uint8 entryIndex = (uint8)_sceneryGroupEntries.GetCount();
_sceneryThemeTypeToEntryMap[sceneryThemeType] = (uint8)_sceneryGroupEntries.GetCount(); if (entryIndex >= 19)
_sceneryGroupEntries.Add(entryName); {
Console::WriteLine("Warning: More than 19 (max scenery groups) in RCT1 park.");
Console::WriteLine(" [%s] scenery group not added.", entryName);
}
else
{
_sceneryThemeTypeToEntryMap[sceneryThemeType] = (uint8)_sceneryGroupEntries.GetCount();
_sceneryGroupEntries.Add(entryName);
}
} }
} }
@ -472,6 +489,7 @@ void S4Importer::ImportRide(rct_ride * dst, rct1_ride * src)
} }
rct_ride_entry * rideEntry = get_ride_entry(dst->subtype); rct_ride_entry * rideEntry = get_ride_entry(dst->subtype);
Guard::Assert(rideEntry != nullptr && rideEntry != (rct_ride_entry*)-1);
// Ride name // Ride name
dst->name = 0; dst->name = 0;
@ -752,7 +770,7 @@ void S4Importer::LoadObjects(uint8 objectType, List<const char *> entries)
entry.checksum = 0; entry.checksum = 0;
Object * object = objectManager->LoadObject(&entry); Object * object = objectManager->LoadObject(&entry);
if (object == nullptr) if (object == nullptr && objectType != OBJECT_TYPE_SCENERY_SETS)
{ {
log_error("Failed to load %s.", objectName); log_error("Failed to load %s.", objectName);
throw Exception("Failed to load object."); throw Exception("Failed to load object.");
@ -814,11 +832,10 @@ void S4Importer::ImportResearch()
case RCT1_RESEARCH_CATEGORY_THEME: case RCT1_RESEARCH_CATEGORY_THEME:
{ {
uint8 rct1SceneryTheme = researchItem->item; uint8 rct1SceneryTheme = researchItem->item;
if (rct1SceneryTheme != RCT1_SCENERY_THEME_GENERAL && uint8 sceneryGroupEntryIndex = _sceneryThemeTypeToEntryMap[rct1SceneryTheme];
rct1SceneryTheme != RCT1_SCENERY_THEME_JUMPING_FOUNTAINS && if (sceneryGroupEntryIndex != 254 &&
rct1SceneryTheme != RCT1_SCENERY_THEME_GARDEN_CLOCK) sceneryGroupEntryIndex != 255)
{ {
uint8 sceneryGroupEntryIndex = _sceneryThemeTypeToEntryMap[rct1SceneryTheme];
research_insert_scenery_group_entry(sceneryGroupEntryIndex, researched); research_insert_scenery_group_entry(sceneryGroupEntryIndex, researched);
} }
break; break;