mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2.git synced 2025-01-22 10:21:57 -05:00
Code Issues Projects Releases Packages Wiki Activity

ImageTable: make parsing ranges more robust (#23316)

Browse source
This commit is contained in:
Aaron van Geffen 2024-12-04 07:38:30 +01:00 committed by GitHub
parent f9fdac2769
commit 2f450212a5
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 18 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
src/openrct2/object/ImageTable.cpp
View file

@ -92,9 +92,12 @@ std::vector<std::unique_ptr<ImageTable::RequiredImage>> ImageTable::ParseImages(
}
else if (String::StartsWith(s, "$CSG"))
{
auto range = ParseRange(s.substr(4));
if (!range.empty())
auto rangeStart = s.find('[');
auto rangeEnd = s.find(']');
if (rangeStart != std::string::npos && rangeEnd != std::string::npos)
{
auto rangeString = s.substr(rangeStart, rangeEnd - rangeStart + 1);
auto range = ParseRange(rangeString);
if (IsCsgLoaded())
{
for (auto i : range)
@ -118,9 +121,12 @@ std::vector<std::unique_ptr<ImageTable::RequiredImage>> ImageTable::ParseImages(
}
else if (String::StartsWith(s, "$G1"))
{
auto range = ParseRange(s.substr(3));
if (!range.empty())
auto rangeStart = s.find('[');
auto rangeEnd = s.find(']');
if (rangeStart != std::string::npos && rangeEnd != std::string::npos)
{
auto rangeString = s.substr(rangeStart, rangeEnd - rangeStart + 1);
auto range = ParseRange(rangeString);
for (auto i : range)
{
result.push_back(std::make_unique<RequiredImage>(
@ -132,10 +138,11 @@ std::vector<std::unique_ptr<ImageTable::RequiredImage>> ImageTable::ParseImages(
{
auto name = s.substr(14);
auto rangeStart = name.find('[');
if (rangeStart != std::string::npos)
auto rangeEnd = name.find(']');
if (rangeStart != std::string::npos && rangeEnd != std::string::npos)
{
auto rangeString = name.substr(rangeStart);
auto range = ParseRange(name.substr(rangeStart));
auto rangeString = name.substr(rangeStart, rangeEnd - rangeStart + 1);
auto range = ParseRange(rangeString);
name = name.substr(0, rangeStart);
result = LoadObjectImages(context, name, range);
}
@ -144,10 +151,11 @@ std::vector<std::unique_ptr<ImageTable::RequiredImage>> ImageTable::ParseImages(
{
auto name = s.substr(5);
auto rangeStart = name.find('[');
if (rangeStart != std::string::npos)
auto rangeEnd = name.find(']');
if (rangeStart != std::string::npos && rangeEnd != std::string::npos)
{
auto rangeString = name.substr(rangeStart);
auto range = ParseRange(name.substr(rangeStart));
auto rangeString = name.substr(rangeStart, rangeEnd - rangeStart + 1);
auto range = ParseRange(rangeString);
name = name.substr(0, rangeStart);
result = LoadImageArchiveImages(context, name, range);
}