Missed reset function

Client/game_sa/CGameSA.cpp

@@ -829,6 +829,11 @@ void CGameSA::ResetModelLodDistances(void)
     CModelInfoSA::StaticResetLodDistances();
 }
 
+void CGameSA::ResetModelTimes(void)
+{
+    CModelInfoSA::StaticResetModelTimes();
+}
+
 void CGameSA::ResetAlphaTransparencies(void)
 {
     CModelInfoSA::StaticResetAlphaTransparencies();

Client/game_sa/CGameSA.h

@@ -413,6 +413,7 @@ class CGameSA : public CGame
     void         FlushPendingRestreamIPL(void);
     void         ResetModelLodDistances(void);
     void         ResetAlphaTransparencies(void);
+    void         ResetModelTimes(void);
     void         DisableVSync(void);
 
     void  OnPedContextChange(CPed* pPedContext);

Client/game_sa/CModelInfoSA.cpp

@@ -20,6 +20,7 @@ std::map<unsigned short, int>
 std::map<DWORD, float>                                                                CModelInfoSA::ms_ModelDefaultLodDistanceMap;
 std::map<DWORD, BYTE>                                                                 CModelInfoSA::ms_ModelDefaultAlphaTransparencyMap;
 std::unordered_map<CVehicleModelInfoSAInterface*, std::map<eVehicleDummies, CVector>> CModelInfoSA::ms_ModelDefaultDummiesPosition;
+std::map<TimeInfo*, TimeInfo*>                                                        CModelInfoSA::ms_ModelDefaultModelTimeInfo;
 
 CModelInfoSA::CModelInfoSA(void)
 {
@@ -569,11 +570,15 @@ bool CModelInfoSA::SetTime(char cHourOn, char cHourOff)
     m_pInterface = ppModelInfo[m_dwModelID];
     if (m_pInterface)
     {
-        TimeInfo* time = ((TimeInfo*(*)(void))m_pInterface->VFTBL->GetTimeInfo)();
-        if (time)
+        TimeInfo* pTime = ((TimeInfo*(*)(void))m_pInterface->VFTBL->GetTimeInfo)();
+        if (pTime)
         {
-            time->m_nTimeOn = cHourOn;
-            time->m_nTimeOff = cHourOff;
+            if (!MapContains(ms_ModelDefaultModelTimeInfo, pTime))
+            {
+                MapSet(ms_ModelDefaultModelTimeInfo, pTime, new TimeInfo(pTime->m_nTimeOn, pTime->m_nTimeOff, pTime->m_wOtherTimeModel));
+            }
+            pTime->m_nTimeOn = cHourOn;
+            pTime->m_nTimeOff = cHourOff;
             return true;
         }
     }
@@ -596,6 +601,18 @@ bool CModelInfoSA::GetTime(char& cHourOn, char& cHourOff)
     return false;
 }
 
+void CModelInfoSA::StaticResetModelTimes()
+{
+    // Restore default values
+    for (std::map<TimeInfo*, TimeInfo*>::const_iterator iter = ms_ModelDefaultModelTimeInfo.begin(); iter != ms_ModelDefaultModelTimeInfo.end(); ++iter)
+    {
+        iter->first->m_nTimeOn = iter->second->m_nTimeOn;
+        iter->first->m_nTimeOff = iter->second->m_nTimeOff;
+    }
+
+    ms_ModelDefaultModelTimeInfo.clear();
+}
+
 void CModelInfoSA::SetLODDistance(float fDistance)
 {
 #if 0

Client/game_sa/CModelInfoSA.h

@@ -277,6 +277,7 @@ class CModelInfoSA : public CModelInfo
     static std::map<DWORD, float>                                                                ms_ModelDefaultLodDistanceMap;
     static std::map<DWORD, BYTE>                                                                 ms_ModelDefaultAlphaTransparencyMap;
     static std::unordered_map<CVehicleModelInfoSAInterface*, std::map<eVehicleDummies, CVector>> ms_ModelDefaultDummiesPosition;
+    static std::map<TimeInfo*, TimeInfo*>                                                        ms_ModelDefaultModelTimeInfo;
     bool                                                                                         m_bAddedRefForCollision;
     SVehicleSupportedUpgrades                                                                    m_ModelSupportedUpgrades;
 
@@ -328,6 +329,7 @@ class CModelInfoSA : public CModelInfo
     static void    StaticSetHooks(void);
     bool           GetTime(char& cHourOn, char& cHourOff);
     bool           SetTime(char cHourOn, char cHourOff);
+    static void    StaticResetModelTimes(void);
 
     void        SetAlphaTransparencyEnabled(BOOL bEnabled);
     bool        IsAlphaTransparencyEnabled();

Client/mods/deathmatch/logic/CClientGame.cpp

@@ -3541,6 +3541,7 @@ void CClientGame::Event_OnIngame(void)
 
     g_pGame->ResetModelLodDistances();
     g_pGame->ResetAlphaTransparencies();
+    g_pGame->ResetModelTimes();
 
     // Make sure we can access all areas
     g_pGame->GetStats()->ModifyStat(CITIES_PASSED, 2.0);

Client/sdk/game/CGame.h

@@ -237,6 +237,7 @@ class __declspec(novtable) CGame
     virtual void FlushPendingRestreamIPL(void) = 0;
     virtual void ResetModelLodDistances(void) = 0;
     virtual void ResetAlphaTransparencies(void) = 0;
+    virtual void ResetModelTimes(void) = 0;
     virtual void DisableVSync(void) = 0;
 
     virtual void  OnPedContextChange(CPed* pPedContext) = 0;

Client/sdk/game/RenderWare.h

@@ -426,6 +426,7 @@ struct RwError
 };
 
 struct TimeInfo {
+    TimeInfo(char timeOn, char timeOff, short OtherTimeModel) : m_nTimeOn(timeOn), m_nTimeOff(timeOff), m_wOtherTimeModel(OtherTimeModel) {};
     char m_nTimeOn;
     char m_nTimeOff;
     short m_wOtherTimeModel;