Moved and renamed TimeInfoSA

Author: TheNormalnij

Client/game_sa/CModelInfoSA.cpp

@@ -21,7 +21,7 @@ std::map<unsigned short, int>                                         CModelInfo
 std::map<DWORD, float>                                                CModelInfoSA::ms_ModelDefaultLodDistanceMap;
 std::map<DWORD, BYTE>                                                 CModelInfoSA::ms_ModelDefaultAlphaTransparencyMap;
 std::unordered_map<std::uint32_t, std::map<eVehicleDummies, CVector>> CModelInfoSA::ms_ModelDefaultDummiesPosition;
-std::map<TimeInfo*, TimeInfo*>                                        CModelInfoSA::ms_ModelDefaultModelTimeInfo;
+std::map<TimeInfoSA*, TimeInfoSA*>                                    CModelInfoSA::ms_ModelDefaultModelTimeInfo;
 std::unordered_map<DWORD, unsigned short>                             CModelInfoSA::ms_OriginalObjectPropertiesGroups;
 std::unordered_map<DWORD, std::pair<float, float>>                    CModelInfoSA::ms_VehicleModelDefaultWheelSizes;
 
@@ -574,10 +574,10 @@ bool CModelInfoSA::SetTime(char cHourOn, char cHourOff)
     if (GetModelType() != MODEL_INFO_TYPE_TIME)
         return false;
 
-    TimeInfo* pTime = &static_cast<CTimeModelInfoSAInterface*>(m_pInterface)->timeInfo;
+    TimeInfoSA* pTime = &static_cast<CTimeModelInfoSAInterface*>(m_pInterface)->timeInfo;
 
     if (!MapContains(ms_ModelDefaultModelTimeInfo, pTime))
-        MapSet(ms_ModelDefaultModelTimeInfo, pTime, new TimeInfo(pTime->m_nTimeOn, pTime->m_nTimeOff, pTime->m_wOtherTimeModel));
+        MapSet(ms_ModelDefaultModelTimeInfo, pTime, new TimeInfoSA(pTime->m_nTimeOn, pTime->m_nTimeOff, pTime->m_wOtherTimeModel));
 
     pTime->m_nTimeOn = cHourOn;
     pTime->m_nTimeOff = cHourOff;
@@ -593,7 +593,7 @@ bool CModelInfoSA::GetTime(char& cHourOn, char& cHourOff)
     if (GetModelType() != MODEL_INFO_TYPE_TIME)
         return false;
 
-    TimeInfo* pTime = &static_cast<CTimeModelInfoSAInterface*>(m_pInterface)->timeInfo;
+    TimeInfoSA* pTime = &static_cast<CTimeModelInfoSAInterface*>(m_pInterface)->timeInfo;
 
     cHourOn = pTime->m_nTimeOn;
     cHourOff = pTime->m_nTimeOff;
@@ -603,7 +603,7 @@ bool CModelInfoSA::GetTime(char& cHourOn, char& cHourOff)
 void CModelInfoSA::StaticResetModelTimes()
 {
     // Restore default values
-    for (std::map<TimeInfo*, TimeInfo*>::const_iterator iter = ms_ModelDefaultModelTimeInfo.begin(); iter != ms_ModelDefaultModelTimeInfo.end(); ++iter)
+    for (std::map<TimeInfoSA*, TimeInfoSA*>::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;

Client/game_sa/CModelInfoSA.h

@@ -219,10 +219,18 @@ class CBaseModelInfoSAInterface
     // +772 = Anim file index
 };
 
+struct TimeInfoSA
+{
+    TimeInfoSA(char timeOn, char timeOff, short OtherTimeModel) : m_nTimeOn(timeOn), m_nTimeOff(timeOff), m_wOtherTimeModel(OtherTimeModel){};
+    char  m_nTimeOn;
+    char  m_nTimeOff;
+    short m_wOtherTimeModel;
+};
+
 class CTimeModelInfoSAInterface : public CBaseModelInfoSAInterface
 {
 public:
-    TimeInfo timeInfo;
+    TimeInfoSA timeInfo;
 };
 
 class CVehicleModelVisualInfoSAInterface            // Not sure about this name. If somebody knows more, please change
@@ -285,7 +293,7 @@ class CModelInfoSA : public CModelInfo
     static std::map<DWORD, float>                                                ms_ModelDefaultLodDistanceMap;
     static std::map<DWORD, BYTE>                                                 ms_ModelDefaultAlphaTransparencyMap;
     static std::unordered_map<std::uint32_t, std::map<eVehicleDummies, CVector>> ms_ModelDefaultDummiesPosition;
-    static std::map<TimeInfo*, TimeInfo*>                                        ms_ModelDefaultModelTimeInfo;
+    static std::map<TimeInfoSA*, TimeInfoSA*>                                    ms_ModelDefaultModelTimeInfo;
     static std::unordered_map<DWORD, unsigned short>                             ms_OriginalObjectPropertiesGroups;
     static std::unordered_map<DWORD, std::pair<float, float>>                    ms_VehicleModelDefaultWheelSizes;
     bool                                                                         m_bAddedRefForCollision;

Client/sdk/game/RenderWare.h

@@ -479,10 +479,3 @@ struct RwError
 {
     int err1, err2;
 };
-
-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;
-};