review fixes for class

Author: Proxy-99

Client/game_sa/CClockSA.cpp

@@ -30,3 +30,20 @@ void CClockSA::Get(BYTE* bHour, BYTE* bMinute)
     *bMinute = *(BYTE*)VAR_TimeMinutes;
     *bHour = *(BYTE*)VAR_TimeHours;
 }
+
+
+bool CClockSA::SetTimerCycle(bool value) noexcept
+{
+    if (value)
+        MemSet((void*)0x53BFBD, 0x90, 5);
+    else
+        MemCpy((void*)0x53BFBD, "\xE8\x4E\x0F\xFF\xFF", 5);
+
+    m_bTimeCycleFrozen = value;
+    return true;
+}
+
+bool CClockSA::ResetTimerCycle() noexcept
+{
+    return SetTimerCycle(false);
+}

Client/game_sa/CClockSA.h

@@ -22,4 +22,11 @@ class CClockSA : public CClock
 public:
     void Set(BYTE bHour, BYTE bMinute);
     void Get(BYTE* bHour, BYTE* bMinute);
+
+    bool SetTimerCycle(bool value) noexcept;
+    bool GetTimerCycleEnabled() const noexcept { return m_bTimeCycleFrozen; };
+    bool ResetTimerCycle() noexcept;
+
+private:
+    bool m_bTimeCycleFrozen;
 };

Client/game_sa/CWeatherSA.cpp

@@ -228,19 +228,3 @@ bool CWeatherSA::ResetRainbow()
     MemCpy((LPVOID)(0x72BF59 + 2), &originalCodes, 3);
     return true;
 }
-
-bool CWeatherSA::SetTimerCycle(bool value) noexcept
-{
-    if (value)
-        MemSet((void*)0x53BFBD, 0x90, 5);
-    else
-        MemCpy((void*)0x53BFBD, "\xE8\x4E\x0F\xFF\xFF", 5);
-
-    m_bTimeCycleFrozen = value;
-    return true;
-}
-
-bool CWeatherSA::ResetTimerCycle() noexcept
-{
-    return SetTimerCycle(false);
-}

Client/game_sa/CWeatherSA.h

@@ -55,10 +55,6 @@ class CWeatherSA : public CWeather
     bool  SetRainbow(float fAmount);
     bool  ResetRainbow();
 
-    bool SetTimerCycle(bool value) noexcept;
-    bool GetTimerCycleEnabled() const noexcept { return m_bTimeCycleFrozen; };
-    bool ResetTimerCycle() noexcept;
-
 private:
     static unsigned char* VAR_CWeather__ForcedWeatherType;
     static unsigned char* VAR_CWeather__OldWeatherType;

Client/mods/deathmatch/logic/CClientGame.cpp

@@ -35,6 +35,7 @@
 #include <game/CBuildingRemoval.h>
 #include <windowsx.h>
 #include "CServerInfo.h"
+#include "game/CClock.h"
 
 SString StringZeroPadout(const SString& strInput, uint uiPadoutSize)
 {
@@ -3418,7 +3419,6 @@ void CClientGame::Event_OnIngame()
 
     g_pGame->GetBuildingRemoval()->ClearRemovedBuildingLists();
     g_pGame->GetWorld()->SetOcclusionsEnabled(true);
-    g_pGame->GetWeather()->ResetTimerCycle();
 
     g_pGame->ResetModelLodDistances();
     g_pGame->ResetModelFlags();
@@ -5544,6 +5544,7 @@ void CClientGame::ResetMapInfo()
     g_pGame->GetWeather()->ResetWaterFog();
     g_pGame->GetWeather()->ResetSandstorm();
     g_pGame->GetWeather()->ResetRainbow();
+    g_pGame->GetClock()->ResetTimerCycle();
 
     // Disable the change of any player stats
     g_pMultiplayer->SetLocalStatsStatic(true);

Client/mods/deathmatch/logic/luadefs/CLuaWorldDefs.cpp

@@ -12,6 +12,7 @@
 #include <game/CWeather.h>
 #include <game/CColPoint.h>
 #include <game/CCoronas.h>
+#include <game/CClock.h>
 #include "lua/CLuaFunctionParser.h"
 
 void CLuaWorldDefs::LoadFunctions()
@@ -2129,7 +2130,7 @@ std::variant<bool, float, CLuaMultiReturn<float, float, float>> CLuaWorldDefs::G
         case eWorldProperty::WEATHER_RAINBOW:
             return g_pGame->GetWeather()->GetRainbow();
         case eWorldProperty::TIME_CYCLE:
-            return g_pGame->GetWeather()->GetTimerCycleEnabled();
+            return g_pGame->GetClock()->GetTimerCycleEnabled();
     }
     return false;
 }
@@ -2203,7 +2204,7 @@ bool CLuaWorldDefs::SetWorldProperty(eWorldProperty property, std::variant<bool,
         case eWorldProperty::WEATHER_RAINBOW:
             return g_pGame->GetWeather()->SetRainbow(arg1);
         case  eWorldProperty::TIME_CYCLE:
-            return g_pGame->GetWeather()->SetTimerCycle(argBool);
+            return g_pGame->GetClock()->SetTimerCycle(argBool);
     }
     return false;
 }
@@ -2253,7 +2254,7 @@ bool CLuaWorldDefs::ResetWorldProperty(eWorldProperty property)
         case eWorldProperty::WEATHER_RAINBOW:
             return g_pGame->GetWeather()->ResetRainbow();
         case eWorldProperty::TIME_CYCLE:
-            return g_pGame->GetWeather()->ResetTimerCycle();
+            return g_pGame->GetClock()->ResetTimerCycle();
     }
     return false;
 }

Client/sdk/game/CClock.h

@@ -16,4 +16,8 @@ class CClock
 public:
     virtual void Set(BYTE bHour, BYTE bMinute) = 0;
     virtual void Get(BYTE* bHour, BYTE* bMinute) = 0;
+
+    virtual bool SetTimerCycle(bool value) noexcept = 0;
+    virtual bool GetTimerCycleEnabled() const noexcept = 0;
+    virtual bool ResetTimerCycle() noexcept = 0;
 };

Client/sdk/game/CWeather.h

@@ -51,8 +51,4 @@ class CWeather
     virtual float GetRainbow() const = 0;
     virtual bool  SetRainbow(float fAmount) = 0;
     virtual bool  ResetRainbow() = 0;
-
-    virtual bool SetTimerCycle(bool value) noexcept = 0;
-    virtual bool GetTimerCycleEnabled() const noexcept = 0;
-    virtual bool ResetTimerCycle() noexcept = 0;
 };