From 3c8480ee2623f6dca419a3ee5a04dbe5655440f3 Mon Sep 17 00:00:00 2001
From: Matt <m.moninger.h@gmail.com>
Date: Tue, 12 Mar 2019 21:10:32 +0100
Subject: [PATCH] Remove unused variables and strip unused DEBUG_DESYNC paths.

---
 src/openrct2/network/Network.cpp   |  4 --
 src/openrct2/scenario/Scenario.cpp | 67 ------------------------------
 2 files changed, 71 deletions(-)

diff --git a/src/openrct2/network/Network.cpp b/src/openrct2/network/Network.cpp
index 7035065717..d9775e7c89 100644
--- a/src/openrct2/network/Network.cpp
+++ b/src/openrct2/network/Network.cpp
@@ -304,8 +304,6 @@ private:
     SOCKET_STATUS _lastConnectStatus = SOCKET_STATUS_CLOSED;
     uint32_t last_ping_sent_time = 0;
     uint32_t server_tick = 0;
-    uint32_t server_srand0 = 0;
-    std::string server_sprite_hash;
     uint8_t player_id = 0;
     std::list<std::unique_ptr<NetworkConnection>> client_connection_list;
     std::multiset<GameCommand> game_command_queue;
@@ -2882,8 +2880,6 @@ void Network::Client_Handle_TICK([[maybe_unused]] NetworkConnection& connection,
     tickData.srand0 = srand0;
     tickData.tick = server_tick;
 
-    server_srand0 = srand0;
-    server_sprite_hash.resize(0);
     if (flags & NETWORK_TICK_FLAG_CHECKSUMS)
     {
         const char* text = packet.ReadString();
diff --git a/src/openrct2/scenario/Scenario.cpp b/src/openrct2/scenario/Scenario.cpp
index 76761bc8c6..1e1be5e04f 100644
--- a/src/openrct2/scenario/Scenario.cpp
+++ b/src/openrct2/scenario/Scenario.cpp
@@ -493,78 +493,11 @@ void scenario_rand_seed(random_engine_t::result_type s0, random_engine_t::result
  *
  * @return eax
  */
-#ifndef DEBUG_DESYNC
 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();
 }
 
-#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)
 {
     if (max < 2)