mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2025-12-10 09:32:29 +01:00
Code Issues Releases Wiki Activity

Merge pull request #15985 from ZehMatt/refactor/entities2

Browse Source 
Refactor Sprite to Entity
This commit is contained in:
ζeh Matt
2021-11-25 12:53:50 -08:00
committed by GitHub
parent 2b4eaab5dc 860fb77da4
commit 56e78d5733
115 changed files with 399 additions and 390 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/openrct2/ReplayManager.cpp
View File

@@ -26,13 +26,13 @@
#include "config/Config.h"
#include "core/DataSerialiser.h"
#include "core/Path.hpp"
#include "entity/EntityRegistry.h"
#include "entity/EntityTweener.h"
#include "management/NewsItem.h"
#include "object/ObjectManager.h"
#include "object/ObjectRepository.h"
#include "scenario/Scenario.h"
#include "world/EntityTweener.h"
#include "world/Park.h"
#include "world/Sprite.h"
#include "zlib.h"
#include <chrono>
@@ -92,7 +92,7 @@ namespace OpenRCT2
uint32_t tickStart; // First tick of replay.
uint32_t tickEnd; // Last tick of replay.
std::multiset<ReplayCommand> commands;
std::vector<std::pair<uint32_t, rct_sprite_checksum>> checksums;
std::vector<std::pair<uint32_t, EntitiesChecksum>> checksums;
uint32_t checksumIndex;
OpenRCT2::MemoryStream gameStateSnapshots;
};
@@ -148,7 +148,7 @@ namespace OpenRCT2
_currentRecording->commands.emplace(gCurrentTicks, std::move(ga), _commandId++);
}
void AddChecksum(uint32_t tick, rct_sprite_checksum&& checksum)
void AddChecksum(uint32_t tick, EntitiesChecksum&& checksum)
{
_currentRecording->checksums.emplace_back(std::make_pair(tick, std::move(checksum)));
}
@@ -161,7 +161,7 @@ namespace OpenRCT2
if ((_mode == ReplayMode::RECORDING || _mode == ReplayMode::NORMALISATION) && gCurrentTicks == _nextChecksumTick)
{
rct_sprite_checksum checksum = sprite_checksum();
EntitiesChecksum checksum = GetAllEntitiesChecksum();
AddChecksum(gCurrentTicks, std::move(checksum));
_nextChecksumTick = gCurrentTicks + ChecksumTicksDelta();
@@ -286,7 +286,7 @@ namespace OpenRCT2
_currentRecording->tickEnd = gCurrentTicks;
{
rct_sprite_checksum checksum = sprite_checksum();
EntitiesChecksum checksum = GetAllEntitiesChecksum();
AddChecksum(gCurrentTicks, std::move(checksum));
}
@@ -793,7 +793,7 @@ namespace OpenRCT2
{
_currentReplay->checksumIndex++;
rct_sprite_checksum checksum = sprite_checksum();
EntitiesChecksum checksum = GetAllEntitiesChecksum();
if (savedChecksum.second.raw != checksum.raw)
{
uint32_t replayTick = gCurrentTicks - _currentReplay->tickStart;