mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2025-12-23 15:52:55 +01:00
Code Issues Releases Wiki Activity

Remove unused variables and strip unused DEBUG_DESYNC paths.

Browse Source
This commit is contained in:
Matt
2019-03-12 21:10:32 +01:00
parent b249928222
commit 3c8480ee26
2 changed files with 0 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/openrct2/network/Network.cpp
View File

@@ -304,8 +304,6 @@ private:
SOCKET_STATUS _lastConnectStatus = SOCKET_STATUS_CLOSED; SOCKET_STATUS _lastConnectStatus = SOCKET_STATUS_CLOSED;
uint32_t last_ping_sent_time = 0; uint32_t last_ping_sent_time = 0;
uint32_t server_tick = 0; uint32_t server_tick = 0;
uint32_t server_srand0 = 0;
std::string server_sprite_hash;
uint8_t player_id = 0; uint8_t player_id = 0;
std::list<std::unique_ptr<NetworkConnection>> client_connection_list; std::list<std::unique_ptr<NetworkConnection>> client_connection_list;
std::multiset<GameCommand> game_command_queue; std::multiset<GameCommand> game_command_queue;
@@ -2882,8 +2880,6 @@ void Network::Client_Handle_TICK([[maybe_unused]] NetworkConnection& connection,
tickData.srand0 = srand0; tickData.srand0 = srand0;
tickData.tick = server_tick; tickData.tick = server_tick;
server_srand0 = srand0;
server_sprite_hash.resize(0);
if (flags & NETWORK_TICK_FLAG_CHECKSUMS) if (flags & NETWORK_TICK_FLAG_CHECKSUMS)
{ {
const char* text = packet.ReadString(); const char* text = packet.ReadString();

67
src/openrct2/scenario/Scenario.cpp
View File

@@ -493,78 +493,11 @@ void scenario_rand_seed(random_engine_t::result_type s0, random_engine_t::result
* *
* @return eax * @return eax
*/ */
#ifndef DEBUG_DESYNC
random_engine_t::result_type scenario_rand() random_engine_t::result_type scenario_rand()
#else
static FILE* fp = nullptr;
static const char* realm = "LC";
uint32_t dbg_scenario_rand(const char* file, const char* function, const uint32_t line, const void* data)
#endif
{ {
#ifdef DEBUG_DESYNC
if (fp == nullptr)
{
if (network_get_mode() == NETWORK_MODE_SERVER)
{
fp = fopen("server_rand.txt", "wt");
realm = "SV";
}
else if (network_get_mode() == NETWORK_MODE_CLIENT)
{
fp = fopen("client_rand.txt", "wt");
realm = "CL";
}
else
{
if (fp)
fclose(fp);
fp = nullptr;
realm = "LC";
}
}
if (fp)
{
fprintf(fp, "Tick: %d, Rand: %08X - REF: %s:%u %s (%p)\n", gCurrentTicks, gScenarioSrand1, file, line, function, data);
}
if (!gInUpdateCode && !gInMapInitCode)
{
log_warning("scenario_rand called from outside game update");
assert(false);
}
#endif
return gScenarioRand(); return gScenarioRand();
} }
#ifdef DEBUG_DESYNC
void dbg_report_desync(uint32_t tick, uint32_t srand0, uint32_t server_srand0, const char* clientHash, const char* serverHash)
{
if (fp == nullptr)
{
if (network_get_mode() == NETWORK_MODE_SERVER)
{
fp = fopen("server_rand.txt", "wt");
realm = "SV";
}
else if (network_get_mode() == NETWORK_MODE_CLIENT)
{
fp = fopen("client_rand.txt", "wt");
realm = "CL";
}
}
if (fp)
{
const bool sprites_mismatch = serverHash[0] != '\0' && strcmp(clientHash, serverHash);
fprintf(
fp, "[%s] !! DESYNC !! Tick: %d, Client Hash: %s, Server Hash: %s, Client Rand: %08X, Server Rand: %08X - %s\n",
realm, tick, clientHash, ((serverHash[0] != '\0') ? serverHash : "<NONE:0>"), srand0, server_srand0,
(sprites_mismatch ? "Sprite hash mismatch" : "scenario rand mismatch"));
}
}
#endif
uint32_t scenario_rand_max(uint32_t max) uint32_t scenario_rand_max(uint32_t max)
{ {
if (max < 2) if (max < 2)