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

Make vector for title sequence commands flexible

This commit is contained in:
Hielke Morsink 2022-05-02 21:52:25 +02:00 committed by GitHub
parent e273364b53
commit 717eae76cc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
src/openrct2/title/TitleSequence.cpp
View File

@ -27,13 +27,14 @@
#include "../util/Util.h" #include "../util/Util.h"
#include <algorithm> #include <algorithm>
#include <array>
#include <memory> #include <memory>
#include <vector> #include <vector>
static std::vector<std::string> GetSaves(const std::string& path); static std::vector<std::string> GetSaves(const std::string& path);
static std::vector<std::string> GetSaves(IZipArchive* zip); static std::vector<std::string> GetSaves(IZipArchive* zip);
static std::vector<TitleCommand> LegacyScriptRead(const std::vector<uint8_t>& script, std::vector<std::string> saves); static std::vector<TitleCommand> LegacyScriptRead(const std::vector<uint8_t>& script, std::vector<std::string> saves);
static void LegacyScriptGetLine(OpenRCT2::IStream* stream, char* parts); static void LegacyScriptGetLine(OpenRCT2::IStream* stream, std::vector<std::array<char, 128>>& parts);
static std::vector<uint8_t> ReadScriptFile(const std::string& path); static std::vector<uint8_t> ReadScriptFile(const std::string& path);
static std::string LegacyScriptWrite(const TitleSequence& seq); static std::string LegacyScriptWrite(const TitleSequence& seq);
@ -323,12 +324,10 @@ static std::vector<TitleCommand> LegacyScriptRead(const std::vector<uint8_t>& sc
auto fs = OpenRCT2::MemoryStream(script.data(), script.size()); auto fs = OpenRCT2::MemoryStream(script.data(), script.size());
do do
{ {
char parts[3 * 128], *token, *part1, *part2; std::vector<std::array<char, 128>> parts;
LegacyScriptGetLine(&fs, parts); LegacyScriptGetLine(&fs, parts);
token = &parts[0 * 128]; const char* token = parts[0].data();
part1 = &parts[1 * 128];
part2 = &parts[2 * 128];
TitleCommand command = {}; TitleCommand command = {};
command.Type = TitleScript::Undefined; command.Type = TitleScript::Undefined;
@ -340,7 +339,7 @@ static std::vector<TitleCommand> LegacyScriptRead(const std::vector<uint8_t>& sc
command.SaveIndex = SAVE_INDEX_INVALID; command.SaveIndex = SAVE_INDEX_INVALID;
for (size_t i = 0; i < saves.size(); i++) for (size_t i = 0; i < saves.size(); i++)
{ {
if (String::Equals(part1, saves[i], true)) if (String::Equals(parts[1].data(), saves[i], true))
{ {
command.SaveIndex = static_cast<uint8_t>(i); command.SaveIndex = static_cast<uint8_t>(i);
break; break;
@ -350,34 +349,34 @@ static std::vector<TitleCommand> LegacyScriptRead(const std::vector<uint8_t>& sc
else if (_stricmp(token, "LOCATION") == 0) else if (_stricmp(token, "LOCATION") == 0)
{ {
command.Type = TitleScript::Location; command.Type = TitleScript::Location;
command.Location.X = atoi(part1) & 0xFF; command.Location.X = atoi(parts[1].data()) & 0xFF;
command.Location.Y = atoi(part2) & 0xFF; command.Location.Y = atoi(parts[2].data()) & 0xFF;
} }
else if (_stricmp(token, "ROTATE") == 0) else if (_stricmp(token, "ROTATE") == 0)
{ {
command.Type = TitleScript::Rotate; command.Type = TitleScript::Rotate;
command.Rotations = atoi(part1) & 0xFF; command.Rotations = atoi(parts[1].data()) & 0xFF;
} }
else if (_stricmp(token, "ZOOM") == 0) else if (_stricmp(token, "ZOOM") == 0)
{ {
command.Type = TitleScript::Zoom; command.Type = TitleScript::Zoom;
command.Zoom = atoi(part1) & 0xFF; command.Zoom = atoi(parts[1].data()) & 0xFF;
} }
else if (_stricmp(token, "SPEED") == 0) else if (_stricmp(token, "SPEED") == 0)
{ {
command.Type = TitleScript::Speed; command.Type = TitleScript::Speed;
command.Speed = std::max(1, std::min(4, atoi(part1) & 0xFF)); command.Speed = std::max(1, std::min(4, atoi(parts[1].data()) & 0xFF));
} }
else if (_stricmp(token, "FOLLOW") == 0) else if (_stricmp(token, "FOLLOW") == 0)
{ {
command.Type = TitleScript::Follow; command.Type = TitleScript::Follow;
command.Follow.SpriteIndex = EntityId::FromUnderlying(atoi(part1) & 0xFFFF); command.Follow.SpriteIndex = EntityId::FromUnderlying(atoi(parts[1].data()) & 0xFFFF);
safe_strcpy(command.Follow.SpriteName, part2, USER_STRING_MAX_LENGTH); safe_strcpy(command.Follow.SpriteName, parts[2].data(), USER_STRING_MAX_LENGTH);
} }
else if (_stricmp(token, "WAIT") == 0) else if (_stricmp(token, "WAIT") == 0)
{ {
command.Type = TitleScript::Wait; command.Type = TitleScript::Wait;
command.Milliseconds = atoi(part1) & 0xFFFF; command.Milliseconds = atoi(parts[1].data()) & 0xFFFF;
} }
else if (_stricmp(token, "RESTART") == 0) else if (_stricmp(token, "RESTART") == 0)
{ {
@ -390,7 +389,7 @@ static std::vector<TitleCommand> LegacyScriptRead(const std::vector<uint8_t>& sc
else if (_stricmp(token, "LOADSC") == 0) else if (_stricmp(token, "LOADSC") == 0)
{ {
command.Type = TitleScript::LoadSc; command.Type = TitleScript::LoadSc;
safe_strcpy(command.Scenario, part1, sizeof(command.Scenario)); safe_strcpy(command.Scenario, parts[1].data(), sizeof(command.Scenario));
} }
} }
if (command.Type != TitleScript::Undefined) if (command.Type != TitleScript::Undefined)
@ -401,19 +400,18 @@ static std::vector<TitleCommand> LegacyScriptRead(const std::vector<uint8_t>& sc
return commands; return commands;
} }
static void LegacyScriptGetLine(OpenRCT2::IStream* stream, char* parts) static void LegacyScriptGetLine(OpenRCT2::IStream* stream, std::vector<std::array<char, 128>>& parts)
{ {
for (int32_t i = 0; i < 3; i++)
{
parts[i * 128] = 0;
}
int32_t part = 0; int32_t part = 0;
int32_t cindex = 0; int32_t cindex = 0;
int32_t whitespace = 1; int32_t whitespace = 1;
int32_t comment = 0; int32_t comment = 0;
bool load = false; bool load = false;
bool sprite = false; bool sprite = false;
for (; part < 3;)
parts.resize(1);
while (true)
{ {
int32_t c = 0; int32_t c = 0;
if (stream->TryRead(&c, 1) != 1) if (stream->TryRead(&c, 1) != 1)
@ -422,12 +420,12 @@ static void LegacyScriptGetLine(OpenRCT2::IStream* stream, char* parts)
} }
if (c == '\n' || c == '\r' || c == EOF) if (c == '\n' || c == '\r' || c == EOF)
{ {
parts[part * 128 + cindex] = 0; parts[part][cindex] = 0;
return; return;
} }
if (c == '#') if (c == '#')
{ {
parts[part * 128 + cindex] = 0; parts[part][cindex] = 0;
comment = 1; comment = 1;
} }
else if (c == ' ' && !comment && !load && (!sprite || part != 2)) else if (c == ' ' && !comment && !load && (!sprite || part != 2))
@ -435,17 +433,18 @@ static void LegacyScriptGetLine(OpenRCT2::IStream* stream, char* parts)
if (!whitespace) if (!whitespace)
{ {
if (part == 0 if (part == 0
&& ((cindex == 4 && _strnicmp(parts, "LOAD", 4) == 0) && ((cindex == 4 && _strnicmp(parts[0].data(), "LOAD", 4) == 0)
|| (cindex == 6 && _strnicmp(parts, "LOADSC", 6) == 0))) || (cindex == 6 && _strnicmp(parts[0].data(), "LOADSC", 6) == 0)))
{ {
load = true; load = true;
} }
else if (part == 0 && cindex == 6 && _strnicmp(parts, "FOLLOW", 6) == 0) else if (part == 0 && cindex == 6 && _strnicmp(parts[0].data(), "FOLLOW", 6) == 0)
{ {
sprite = true; sprite = true;
} }
parts[part * 128 + cindex] = 0; parts[part][cindex] = 0;
part++; part++;
parts.resize(part + 1);
cindex = 0; cindex = 0;
} }
} }
@ -454,13 +453,14 @@ static void LegacyScriptGetLine(OpenRCT2::IStream* stream, char* parts)
whitespace = 0; whitespace = 0;
if (cindex < 127) if (cindex < 127)
{ {
parts[part * 128 + cindex] = c; parts[part][cindex] = c;
cindex++; cindex++;
} }
else else
{ {
parts[part * 128 + cindex] = 0; parts[part][cindex] = 0;
part++; part++;
parts.resize(part + 1);
cindex = 0; cindex = 0;
} }
} }