mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-15 11:03:00 +01:00
Code Issues Releases Wiki Activity

prevent adding duplicate footpath entries

Browse Source
This commit is contained in:
Ted John
2016-04-19 18:39:30 +01:00
parent 228af15a30
commit fb192bba0e
2 changed files with 42 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/core/List.hpp
View File

@@ -111,4 +111,27 @@ public:
}
return SIZE_MAX;
}
size_t IndexOf(T item, std::function<bool(T, T)> comparer)
{
for (size_t i = 0; i < this->size(); i++)
{
T element = std::vector<T>::operator[](i);
if (comparer(item, element))
{
return i;
}
}
return SIZE_MAX;
}
bool Contains(std::function<bool(T)> predicate)
{
return IndexOf(predicate) != SIZE_MAX;
}
bool Contains(T item, std::function<bool(T, T)> comparer)
{
return IndexOf(item, comparer) != SIZE_MAX;
}
};

27
src/rct1/S4Importer.cpp
View File

@@ -28,6 +28,11 @@ extern "C"
#include "../world/scenery.h"
}
static bool ObjectNameComparer(const char * a, const char * b)
{
return String::Equals(a, b, true);
}
void S4Importer::LoadSavedGame(const utf8 * path)
{
if (!rct1_read_sv4(path, &_s4)) {
@@ -106,7 +111,7 @@ void S4Importer::Initialise()
void S4Importer::CreateAvailableObjectMappings()
{
// Add defaults
// Add default scenery groups
_sceneryGroupEntries.AddRange({
"SCGTREES",
"SCGPATHX",
@@ -116,6 +121,7 @@ void S4Importer::CreateAvailableObjectMappings()
"SCGWALLS"
});
// Add default footpaths
_pathEntries.AddRange({
"PATHASH ",
"PATHCRZY",
@@ -159,11 +165,7 @@ void S4Importer::CreateAvailableObjectMappings()
break;
}
size_t index = entries->IndexOf([objectName](const char * x) -> bool
{
return String::Equals(x, objectName, true);
});
if (index == SIZE_MAX)
if (!entries->Contains(objectName, ObjectNameComparer))
{
entries->Add(objectName);
}
@@ -358,8 +360,17 @@ void S4Importer::AddEntryForPath(uint8 pathType)
if (_pathTypeToEntryMap[pathType] == 255)
{
const char * entryName = RCT1::GetPathObject(pathType);
_pathTypeToEntryMap[pathType] = (uint8)_pathEntries.GetCount();
_pathEntries.Add(entryName);
size_t index = _pathEntries.IndexOf(entryName, ObjectNameComparer);
if (index != SIZE_MAX)
{
_pathTypeToEntryMap[pathType] = (uint8)index;
}
else
{
_pathTypeToEntryMap[pathType] = (uint8)_pathEntries.GetCount();
_pathEntries.Add(entryName);
}
}
}