Skip to content

Commit da44836

Browse files
committed
Replace uint with std::uint32_t
1 parent e10df12 commit da44836

File tree

5 files changed

+11
-11
lines changed

5 files changed

+11
-11
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -853,7 +853,7 @@ bool CLuaEngineDefs::EngineAddClothingModel(CClientDFF* pDFF, std::string strMod
853853
return true;
854854
}
855855

856-
bool CLuaEngineDefs::EngineSetClothingCacheTime(uint timeInMs)
856+
bool CLuaEngineDefs::EngineSetClothingCacheTime(std::uint32_t timeInMs)
857857
{
858858
if (!g_pMultiplayer->SetClothingCacheTime(timeInMs))
859859
return false;

Client/mods/deathmatch/logic/luadefs/CLuaEngineDefs.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ class CLuaEngineDefs : public CLuaDefs
6060
LUA_DECLARE(EngineRestoreObjectGroupPhysicalProperties)
6161

6262
static bool EngineAddClothingModel(CClientDFF* pDff, std::string strModelName);
63-
static bool EngineSetClothingCacheTime(uint timeInMs);
63+
static bool EngineSetClothingCacheTime(std::uint32_t timeInMs);
6464
static bool EngineAddClothingTXD(CClientTXD* pTxd, std::string strModelName);
6565
static uint EngineGetModelFlags(uint uiModelID);
6666
static bool EngineSetModelFlags(uint uiModelID, uint uiFlags, std::optional<bool> bIdeFlags);

Client/multiplayer_sa/CMultiplayerSA.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -346,7 +346,7 @@ class CMultiplayerSA : public CMultiplayer
346346
virtual void GetRwResourceStats(SRwResourceStats& outStats);
347347
virtual void GetClothesCacheStats(SClothesCacheStats& outStats);
348348
virtual void ResetClothingCacheTime();
349-
virtual bool SetClothingCacheTime(uint timeInMs);
349+
virtual bool SetClothingCacheTime(std::uint32_t timeInMs);
350350
virtual void SetIsMinimizedAndNotConnected(bool bIsMinimizedAndNotConnected);
351351
virtual void SetMirrorsEnabled(bool bEnabled);
352352

Client/multiplayer_sa/CMultiplayerSA_ClothesCache.cpp

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ class CClumpStore
115115

116116
std::vector<SSavedClumpInfo> savedClumpList;
117117
uint m_uiMaxSize;
118-
uint m_uiMinCacheTime;
118+
std::uint32_t m_minCacheTime;
119119
SClothesCacheStats m_Stats;
120120
int m_iCacheRevision;
121121

@@ -128,7 +128,7 @@ class CClumpStore
128128
{
129129
memset(&m_Stats, 0, sizeof(m_Stats));
130130
m_uiMaxSize = 4;
131-
m_uiMinCacheTime = DEFAULT_CACHE_TIME;
131+
m_minCacheTime = DEFAULT_CACHE_TIME;
132132
m_iCacheRevision = 1;
133133
}
134134

@@ -141,7 +141,7 @@ class CClumpStore
141141
{
142142
uint uiNumCached = 0;
143143

144-
if (m_uiMinCacheTime > 0)
144+
if (m_minCacheTime > 0)
145145
{
146146
for (std::vector<SSavedClumpInfo>::iterator iter = savedClumpList.begin(); iter != savedClumpList.end(); ++iter)
147147
{
@@ -242,7 +242,7 @@ class CClumpStore
242242
if (info.bUnused)
243243
{
244244
uint uiAge = (timeNow - info.timeUnused).ToInt();
245-
if (uiAge > m_uiMinCacheTime)
245+
if (uiAge > m_minCacheTime)
246246
{
247247
if (uiAge > uiBestAge || uiBestAge == -1)
248248
{
@@ -414,13 +414,13 @@ void CMultiplayerSA::GetClothesCacheStats(SClothesCacheStats& outStats)
414414
//
415415
//
416416
//////////////////////////////////////////////////////////////////////////////////////////
417-
bool CMultiplayerSA::SetClothingCacheTime(uint timeInMs)
417+
bool CMultiplayerSA::SetClothingCacheTime(std::uint32_t timeInMs)
418418
{
419-
if (timeInMs == ms_clumpStore.m_uiMinCacheTime)
419+
if (timeInMs == ms_clumpStore.m_minCacheTime)
420420
return false;
421421

422422
ms_clumpStore.savedClumpList.clear();
423-
ms_clumpStore.m_uiMinCacheTime = timeInMs;
423+
ms_clumpStore.m_minCacheTime = timeInMs;
424424

425425
return true;
426426
}

Client/sdk/multiplayer/CMultiplayer.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -456,7 +456,7 @@ class CMultiplayer
456456
virtual void GetRwResourceStats(SRwResourceStats& outStats) = 0;
457457
virtual void GetClothesCacheStats(SClothesCacheStats& outStats) = 0;
458458
virtual void ResetClothingCacheTime() = 0;
459-
virtual bool SetClothingCacheTime(uint timeInMs) = 0;
459+
virtual bool SetClothingCacheTime(std::uint32_t timeInMs) = 0;
460460
virtual void SetIsMinimizedAndNotConnected(bool bIsMinimizedAndNotConnected) = 0;
461461
virtual void SetMirrorsEnabled(bool bEnabled) = 0;
462462

0 commit comments

Comments
 (0)