R5Reloaded/r5sdk
1
0
Fork 0
mirror of https://github.com/Mauler125/r5sdk.git synced 2025-02-09 19:15:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

Prefix global vectors with 'g_v'

Browse Source
This commit is contained in:
Kawe Mazidjatari 2022-05-27 02:21:54 +02:00
parent 47d2e4c915
commit fc74a692fa
5 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
r5dev/datacache/mdlcache.cpp
View File

@ -64,7 +64,7 @@ studiohdr_t* CMDLCache::FindMDL(CMDLCache* cache, MDLHandle_t handle, void* a3)
else else
Error(eDLL_T::ENGINE, "Model with handle \"hu\" not found; replacing with \"%s\".\n", handle, ERROR_MODEL); Error(eDLL_T::ENGINE, "Model with handle \"hu\" not found; replacing with \"%s\".\n", handle, ERROR_MODEL);
g_BadMDLHandles.push_back(handle); g_vBadMDLHandles.push_back(handle);
} }
return pStudioHdr; return pStudioHdr;
@ -147,7 +147,7 @@ studiohdr_t* CMDLCache::FindUncachedMDL(CMDLCache* cache, MDLHandle_t handle, st
else else
Error(eDLL_T::ENGINE, "Model with handle \"hu\" not found; replacing with \"%s\".\n", handle, ERROR_MODEL); Error(eDLL_T::ENGINE, "Model with handle \"hu\" not found; replacing with \"%s\".\n", handle, ERROR_MODEL);
g_BadMDLHandles.push_back(handle); g_vBadMDLHandles.push_back(handle);
} }
pStudioData->m_Mutex.ReleaseWaiter(); pStudioData->m_Mutex.ReleaseWaiter();
@ -169,7 +169,7 @@ studiohdr_t* CMDLCache::FindUncachedMDL(CMDLCache* cache, MDLHandle_t handle, st
else else
Error(eDLL_T::ENGINE, "Attempted to load old model \"%s\"; replacing with \"%s\".\n", szModelName, ERROR_MODEL); Error(eDLL_T::ENGINE, "Attempted to load old model \"%s\"; replacing with \"%s\".\n", szModelName, ERROR_MODEL);
g_BadMDLHandles.push_back(handle); g_vBadMDLHandles.push_back(handle);
} }
pStudioData->m_Mutex.ReleaseWaiter(); pStudioData->m_Mutex.ReleaseWaiter();
@ -197,7 +197,7 @@ studiohdr_t* CMDLCache::FindUncachedMDL(CMDLCache* cache, MDLHandle_t handle, st
else else
Error(eDLL_T::ENGINE, "Model \"%s\" not found and \"%s\" couldn't be loaded.\n", szModelName, ERROR_MODEL); Error(eDLL_T::ENGINE, "Model \"%s\" not found and \"%s\" couldn't be loaded.\n", szModelName, ERROR_MODEL);
g_BadMDLHandles.push_back(handle); g_vBadMDLHandles.push_back(handle);
} }
pStudioData->m_Mutex.ReleaseWaiter(); pStudioData->m_Mutex.ReleaseWaiter();
@ -219,7 +219,7 @@ studiohdr_t* CMDLCache::FindUncachedMDL(CMDLCache* cache, MDLHandle_t handle, st
else else
Error(eDLL_T::ENGINE, "Model \"%s\" has bad studio data; replacing with \"%s\".\n", szModelName, ERROR_MODEL); Error(eDLL_T::ENGINE, "Model \"%s\" has bad studio data; replacing with \"%s\".\n", szModelName, ERROR_MODEL);
g_BadMDLHandles.push_back(handle); g_vBadMDLHandles.push_back(handle);
} }
} }
else else
@ -235,7 +235,7 @@ studiohdr_t* CMDLCache::FindUncachedMDL(CMDLCache* cache, MDLHandle_t handle, st
else else
Error(eDLL_T::ENGINE, "Model \"%s\" has no studio data; replacing with \"%s\".\n", szModelName, ERROR_MODEL); Error(eDLL_T::ENGINE, "Model \"%s\" has no studio data; replacing with \"%s\".\n", szModelName, ERROR_MODEL);
g_BadMDLHandles.push_back(handle); g_vBadMDLHandles.push_back(handle);
} }
} }
} }
@ -350,7 +350,7 @@ studiohdr_t* CMDLCache::GetErrorModel(void)
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
bool CMDLCache::IsKnownBadModel(MDLHandle_t handle) bool CMDLCache::IsKnownBadModel(MDLHandle_t handle)
{ {
return std::find(g_BadMDLHandles.begin(), g_BadMDLHandles.end(), handle) != g_BadMDLHandles.end(); return std::find(g_vBadMDLHandles.begin(), g_vBadMDLHandles.end(), handle) != g_vBadMDLHandles.end();
} }
void MDLCache_Attach() void MDLCache_Attach()

2
r5dev/datacache/mdlcache.h
View File

@ -53,7 +53,7 @@ struct studiodata_t
}; };
inline CMDLFallBack* g_pMDLFallback = new CMDLFallBack(); inline CMDLFallBack* g_pMDLFallback = new CMDLFallBack();
inline vector<MDLHandle_t> g_BadMDLHandles; inline vector<MDLHandle_t> g_vBadMDLHandles;
class CMDLCache class CMDLCache
{ {

12
r5dev/engine/cmodel_bsp.cpp
View File

@ -296,13 +296,13 @@ void MOD_ProcessPakQueue()
{ {
RPakHandle_t pakHandle = g_pakLoadApi->AsyncLoad("common_sdk.rpak", g_pMallocPool.GetPtr(), 4, 0); RPakHandle_t pakHandle = g_pakLoadApi->AsyncLoad("common_sdk.rpak", g_pMallocPool.GetPtr(), 4, 0);
if (pakHandle != -1) if (pakHandle != -1)
g_LoadedPakHandle.push_back(pakHandle); g_vLoadedPakHandle.push_back(pakHandle);
} }
if (strcmp(v17, "ui_mp.rpak") == 0) if (strcmp(v17, "ui_mp.rpak") == 0)
{ {
RPakHandle_t pakHandle = g_pakLoadApi->AsyncLoad("ui_sdk.rpak", g_pMallocPool.GetPtr(), 4, 0); RPakHandle_t pakHandle = g_pakLoadApi->AsyncLoad("ui_sdk.rpak", g_pMallocPool.GetPtr(), 4, 0);
if (pakHandle != -1) if (pakHandle != -1)
g_LoadedPakHandle.push_back(pakHandle); g_vLoadedPakHandle.push_back(pakHandle);
} }
LABEL_37: LABEL_37:
@ -371,7 +371,7 @@ void MOD_PreloadPakFile(const string& svLevelName)
if (nPakId == -1) if (nPakId == -1)
Error(eDLL_T::ENGINE, "%s: unable to load pak '%s' results '%d'\n", __FUNCTION__, svToLoad.c_str(), nPakId); Error(eDLL_T::ENGINE, "%s: unable to load pak '%s' results '%d'\n", __FUNCTION__, svToLoad.c_str(), nPakId);
else else
g_LoadedPakHandle.push_back(nPakId); g_vLoadedPakHandle.push_back(nPakId);
} }
} }
} }
@ -390,15 +390,15 @@ void MOD_PreloadPakFile(const string& svLevelName)
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
void MOD_UnloadPakFile(void) void MOD_UnloadPakFile(void)
{ {
for (auto& it : g_LoadedPakHandle) for (auto& it : g_vLoadedPakHandle)
{ {
if (it >= 0) if (it >= 0)
{ {
g_pakLoadApi->Unload(it); g_pakLoadApi->Unload(it);
} }
} }
g_LoadedPakHandle.clear(); g_vLoadedPakHandle.clear();
g_BadMDLHandles.clear(); g_vBadMDLHandles.clear();
} }
void CModelBsp_Attach() void CModelBsp_Attach()

2
r5dev/rtech/rtech_game.cpp
View File

@ -10,7 +10,7 @@
#include "rtech/rtech_game.h" #include "rtech/rtech_game.h"
#include "rtech/rtech_utils.h" #include "rtech/rtech_utils.h"
vector<RPakHandle_t> g_LoadedPakHandle{ }; vector<RPakHandle_t> g_vLoadedPakHandle;
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// Purpose: load user-requested pak files on-demand // Purpose: load user-requested pak files on-demand

2
r5dev/rtech/rtech_game.h
View File

@ -44,7 +44,7 @@ extern CPakFile* g_pakLoadApi;
void RTech_Game_Attach(); void RTech_Game_Attach();
void RTech_Game_Detach(); void RTech_Game_Detach();
extern vector<RPakHandle_t> g_LoadedPakHandle; extern vector<RPakHandle_t> g_vLoadedPakHandle;
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
class VRTechGame : public IDetour class VRTechGame : public IDetour
{ {