mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2025-12-17 21:12:34 +01:00
Code Issues Releases Wiki Activity

Cleanup.

Browse Source
This commit is contained in:
Matt
2018-12-11 09:57:04 +01:00
parent 669fbd62dd
commit ccc3227113
5 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/openrct2/ReplayManager.cpp
View File

@@ -86,8 +86,7 @@ namespace OpenRCT2
uint32_t tickEnd; // Last tick of replay.
std::multiset<ReplayCommand> commands;
std::vector<std::pair<uint32_t, rct_sprite_checksum>> checksums;
int32_t checksumIndex;
int32_t checksumMismatchIndex;
uint32_t checksumIndex;
};
class ReplayManager final : public IReplayManager
@@ -593,7 +592,7 @@ namespace OpenRCT2
void CheckState()
{
int32_t checksumIndex = _currentReplay->checksumIndex;
uint32_t checksumIndex = _currentReplay->checksumIndex;
if (checksumIndex >= _currentReplay->checksums.size())
return;

3
src/openrct2/core/DataSerialiserTraits.h
View File

@@ -19,6 +19,7 @@
#include "MemoryStream.h"
#include <cstdio>
#include <stdexcept>
template<typename T> struct DataSerializerTraits
{
@@ -268,7 +269,7 @@ template<typename _Ty, size_t _Size> struct DataSerializerTraits<std::array<_Ty,
len = ByteSwapBE(len);
if (len != _Size)
throw std::exception("Invalid size, can't decode");
throw std::runtime_error("Invalid size, can't decode");
DataSerializerTraits<_Ty> s;
for (auto&& sub : val)

7
src/openrct2/world/Sprite.cpp
View File

@@ -57,7 +57,6 @@ std::string rct_sprite_checksum::ToString() const
{
std::string result;
result.clear();
result.reserve(raw.size() * 2);
for (auto b : raw)
{
@@ -262,7 +261,7 @@ rct_sprite_checksum sprite_checksum()
}
}
checksum.raw = std::move(_spriteHashAlg->Finish());
checksum.raw = _spriteHashAlg->Finish();
}
catch (std::exception& e)
{
@@ -274,9 +273,9 @@ rct_sprite_checksum sprite_checksum()
}
#else
const char* sprite_checksum()
rct_sprite_checksum sprite_checksum()
{
return nullptr;
return rct_sprite_checksum{};
}
#endif // DISABLE_NETWORK

7
test/tests/CMakeLists.txt
View File

@@ -188,3 +188,10 @@ set(TILE_ELEMENT_TEST_SOURCES "${CMAKE_CURRENT_LIST_DIR}/TileElements.cpp"
add_executable(test_tile_elements ${TILE_ELEMENT_TEST_SOURCES})
target_link_libraries(test_tile_elements ${GTEST_LIBRARIES} libopenrct2 ${LDL} z)
add_test(NAME tile_elements COMMAND test_tile_elements)
# Replay tests
set(REPLAY_TEST_SOURCES "${CMAKE_CURRENT_LIST_DIR}/ReplayTests.cpp"
"${CMAKE_CURRENT_LIST_DIR}/TestData.cpp")
add_executable(test_replays ${REPLAY_TEST_SOURCES})
target_link_libraries(test_replays ${GTEST_LIBRARIES} libopenrct2 ${LDL} z)
add_test(NAME replay_tests COMMAND test_replays)

2
test/tests/ReplayTests.cpp
View File

@@ -76,7 +76,7 @@ TEST_F(ReplayTests, all)
while (replayManager->IsReplaying())
{
gs->UpdateLogic();
ASSERT_TRUE(replayManager->IsPlaybackStateMismatching());
ASSERT_TRUE(replayManager->IsPlaybackStateMismatching() == false);
}
}
SUCCEED();