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

Cleanup serialization.

This commit is contained in:
Matt 2018-12-06 08:25:26 +01:00
parent d9b91055ca
commit 3ea8ab4bb3
1 changed files with 52 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

104
src/openrct2/ReplayManager.cpp
View File

@ -334,6 +334,49 @@ namespace OpenRCT2
return true;
}
bool SerialiseCommand(DataSerialiser& serialiser, ReplayCommand& command)
{
serialiser << command.tick;
serialiser << command.commandIndex;
bool isGameAction = false;
if (serialiser.IsSaving())
{
isGameAction = command.action != nullptr;
}
serialiser << isGameAction;
if (isGameAction)
{
uint32_t actionType = 0;
if (serialiser.IsSaving())
{
actionType = command.action->GetType();
}
serialiser << actionType;
if (serialiser.IsLoading())
{
command.action = GameActions::Create(actionType);
Guard::Assert(command.action != nullptr);
}
command.action->Serialise(serialiser);
}
else
{
serialiser << command.eax;
serialiser << command.ebx;
serialiser << command.ecx;
serialiser << command.edx;
serialiser << command.esi;
serialiser << command.edi;
serialiser << command.ebp;
serialiser << command.callback;
}
return true;
}
bool Serialise(DataSerialiser& serialiser, ReplayRecordData& data)
{
serialiser << data.name;
@ -348,31 +391,7 @@ namespace OpenRCT2
{
for (auto& command : data.commands)
{
serialiser << command.tick;
serialiser << command.commandIndex;
if (command.action != nullptr)
{
bool isGameAction = true;
serialiser << isGameAction;
uint32_t actionType = command.action->GetType();
serialiser << actionType;
command.action->Serialise(serialiser);
}
else
{
bool isGameAction = false;
serialiser << isGameAction;
serialiser << command.eax;
serialiser << command.ebx;
serialiser << command.ecx;
serialiser << command.edx;
serialiser << command.esi;
serialiser << command.edi;
serialiser << command.ebp;
serialiser << command.callback;
}
SerialiseCommand(serialiser, const_cast<ReplayCommand&>(command));
}
}
else
@ -380,33 +399,7 @@ namespace OpenRCT2
for (uint32_t i = 0; i < countCommands; i++)
{
ReplayCommand command = {};
serialiser << command.tick;
serialiser << command.commandIndex;
bool isGameAction = false;
serialiser << isGameAction;
if (isGameAction)
{
uint32_t actionType = 0;
serialiser << actionType;
command.action = GameActions::Create(actionType);
Guard::Assert(command.action != nullptr);
command.action->Serialise(serialiser);
}
else
{
serialiser << command.eax;
serialiser << command.ebx;
serialiser << command.ecx;
serialiser << command.edx;
serialiser << command.esi;
serialiser << command.edi;
serialiser << command.ebp;
serialiser << command.callback;
}
SerialiseCommand(serialiser, command);
data.commands.emplace(std::move(command));
}
@ -419,6 +412,13 @@ namespace OpenRCT2
{
auto& replayQueue = _current->commands;
// If we run out of commands we can stop the replay.
if (replayQueue.empty())
{
StopPlayback();
return;
}
while (replayQueue.begin() != replayQueue.end())
{
const ReplayCommand& command = (*replayQueue.begin());