Refactoring Part 4 - SharedUtils.Misc

Client/core/DXHook/CProxyDirect3D9.cpp

@@ -26,7 +26,7 @@ CProxyDirect3D9::CProxyDirect3D9(IDirect3D9* pInterface)
 CProxyDirect3D9::~CProxyDirect3D9()
 {
     WriteDebugEvent(SString("CProxyDirect3D9::~CProxyDirect3D9 %08x", this));
-    ListRemove(ms_CreatedDirect3D9List, m_pDevice);
+    ListRemoveAll(ms_CreatedDirect3D9List, m_pDevice);
     m_pDevice = NULL;
 }
 

Client/core/ServerBrowser/CServerList.cpp

@@ -614,7 +614,7 @@ void CServerListItemList::RemoveItem(CServerListItem* pItem)
     dassert(MapFindRef(m_AddressMap, key) == pItem);
 
     MapRemove(m_AddressMap, key);
-    ListRemove(m_List, pItem);
+    ListRemoveAll(m_List, pItem);
 
     dassert(m_List.size() == m_AddressMap.size());
 }

Client/game_sa/CRenderWareSA.TextureReplacing.cpp

@@ -249,7 +249,7 @@ void CRenderWareSA::ModelInfoTXDRemoveTextures(SReplacementTextures* pReplacemen
         }
 
         // Remove refs
-        ListRemove(pInfo->usedByReplacements, pReplacementTextures);
+        ListRemoveAll(pInfo->usedByReplacements, pReplacementTextures);
 
         // If no refs left, check original state and then remove info
         if (pInfo->usedByReplacements.empty())
@@ -263,7 +263,7 @@ void CRenderWareSA::ModelInfoTXDRemoveTextures(SReplacementTextures* pReplacemen
             {
                 RwTexture* pOriginalTexture = pInfo->originalTextures[i];
                 assert(ListContains(currentTextures, pOriginalTexture));
-                ListRemove(currentTextures, pOriginalTexture);
+                ListRemoveAll(currentTextures, pOriginalTexture);
             }
             assert(currentTextures.empty());
         #endif

Client/loader/CInstallManager.cpp

@@ -1245,11 +1245,11 @@ SString CInstallManager::_ProcessAppCompatChecks()
         // Break into words
         std::vector<WString> entryList;
         strValue.Split(" ", entryList);
-        ListRemove(entryList, WString());
+        ListRemoveAll(entryList, WString());
 
         // Apply removals
         for (uint a = 0; a < removeList.size(); a++)
-            ListRemove(entryList, removeList[a]);
+            ListRemoveAll(entryList, removeList[a]);
 
         // Apply adds
         for (uint a = 0; a < addList.size(); a++)

Client/loader/Utils.cpp

@@ -368,7 +368,7 @@ std::vector<DWORD> GetOtherMTAProcessList()
         ListAddUnique(result, processId);
 
     // Ignore this process
-    ListRemove(result, GetCurrentProcessId());
+    ListRemoveAll(result, GetCurrentProcessId());
 
     return result;
 }

Client/mods/deathmatch/logic/CClientColManager.cpp

@@ -214,5 +214,5 @@ void CClientColManager::DeleteAll()
 
 void CClientColManager::RemoveFromList(CClientColShape* pShape)
 {
-    ListRemove(m_List, pShape);
+    ListRemoveAll(m_List, pShape);
 }

Client/mods/deathmatch/logic/CClientEntity.cpp

@@ -649,7 +649,7 @@ void CClientEntity::AttachTo(CClientEntity* pEntity)
     if (m_pAttachedToEntity)
     {
         assert(ListContains(m_pAttachedToEntity->m_AttachedEntities, this));
-        ListRemove(m_pAttachedToEntity->m_AttachedEntities, this);
+        ListRemoveAll(m_pAttachedToEntity->m_AttachedEntities, this);
     }
 
     m_pAttachedToEntity = pEntity;

Client/mods/deathmatch/logic/CClientEntity.h

@@ -296,7 +296,7 @@ class CClientEntity : public CClientEntityBase
     void RemoveOriginSourceUser(CClientPed* pModel) { m_OriginSourceUsers.remove(pModel); }
 
     void AddContact(CClientPed* pModel) { m_Contacts.push_back(pModel); }
-    void RemoveContact(CClientPed* pModel) { ListRemove(m_Contacts, pModel); }
+    void RemoveContact(CClientPed* pModel) { ListRemoveAll(m_Contacts, pModel); }
 
     virtual CEntity*       GetGameEntity() { return NULL; }
     virtual const CEntity* GetGameEntity() const { return NULL; }

Client/mods/deathmatch/logic/CClientObject.cpp

@@ -302,7 +302,7 @@ bool CClientObject::SetLowLodObject(CClientObject* pNewLowLodObject)
         assert(ListContains(m_pLowLodObject->m_HighLodObjectList, this));
 
         // Clear there and here
-        ListRemove(m_pLowLodObject->m_HighLodObjectList, this);
+        ListRemoveAll(m_pLowLodObject->m_HighLodObjectList, this);
         m_pLowLodObject = NULL;
         return true;
     }

Client/mods/deathmatch/logic/CClientObjectManager.cpp

@@ -222,7 +222,7 @@ void CClientObjectManager::OnDestruction(CClientObject* pObject)
             m_uiLowLodStreamedInCount--;
         else
             m_uiStreamedInCount--;
-        ListRemove(m_StreamedIn, pObject);
+        ListRemoveAll(m_StreamedIn, pObject);
     }
     UpdateLimitInfo();
 }
@@ -334,15 +334,15 @@ void CClientObjectManager::RemoveFromLists(CClientObject* pObject)
 {
     if (m_bCanRemoveFromList)
     {
-        ListRemove(m_Objects, pObject);
+        ListRemoveAll(m_Objects, pObject);
     }
     if (ListContains(m_StreamedIn, pObject))
     {
         if (pObject->IsLowLod())
             m_uiLowLodStreamedInCount--;
         else
             m_uiStreamedInCount--;
-        ListRemove(m_StreamedIn, pObject);
+        ListRemoveAll(m_StreamedIn, pObject);
     }
 }
 

Client/mods/deathmatch/logic/CClientPedManager.cpp

@@ -82,7 +82,7 @@ void CClientPedManager::RemoveFromList(CClientPed* pPed)
 {
     if (m_bRemoveFromList)
     {
-        ListRemove(m_List, pPed);
+        ListRemoveAll(m_List, pPed);
     }
 }
 
@@ -95,7 +95,7 @@ void CClientPedManager::OnCreation(CClientPed* pPed)
 
 void CClientPedManager::OnDestruction(CClientPed* pPed)
 {
-    ListRemove(m_StreamedIn, pPed);
+    ListRemoveAll(m_StreamedIn, pPed);
 }
 
 void CClientPedManager::RestreamPeds(unsigned short usModel)

Client/mods/deathmatch/logic/CClientPerfStatManager.cpp

@@ -108,7 +108,7 @@ void CClientPerfStatManagerImpl::AddModule(CClientPerfStatModule* pModule)
 ///////////////////////////////////////////////////////////////
 void CClientPerfStatManagerImpl::RemoveModule(CClientPerfStatModule* pModule)
 {
-    ListRemove(m_ModuleList, pModule);
+    ListRemoveAll(m_ModuleList, pModule);
 }
 
 ///////////////////////////////////////////////////////////////

Client/mods/deathmatch/logic/CClientVehicleManager.cpp

@@ -715,9 +715,9 @@ void CClientVehicleManager::RemoveFromLists(CClientVehicle* pVehicle)
 {
     if (m_bCanRemoveFromList)
     {
-        ListRemove(m_List, pVehicle);
+        ListRemoveAll(m_List, pVehicle);
     }
-    ListRemove(m_StreamedIn, pVehicle);
+    ListRemoveAll(m_StreamedIn, pVehicle);
 }
 
 bool CClientVehicleManager::Exists(CClientVehicle* pVehicle)
@@ -739,7 +739,7 @@ void CClientVehicleManager::OnCreation(CClientVehicle* pVehicle)
 
 void CClientVehicleManager::OnDestruction(CClientVehicle* pVehicle)
 {
-    ListRemove(m_StreamedIn, pVehicle);
+    ListRemoveAll(m_StreamedIn, pVehicle);
 }
 
 void CClientVehicleManager::RestreamVehicles(unsigned short usModel)

Client/mods/deathmatch/logic/CResourceFileDownloadManager.cpp

@@ -79,7 +79,7 @@ void CResourceFileDownloadManager::UpdatePendingDownloads()
         if (pResourceFile->GetDownloadPriorityGroup() == iGroup)
         {
             // Move to active list and begin download
-            ListRemove(m_PendingFileDownloadList, pResourceFile);
+            ListRemoveAll(m_PendingFileDownloadList, pResourceFile);
             m_ActiveFileDownloadList.push_back(pResourceFile);
             BeginResourceFileDownload(pResourceFile, 0);
 
@@ -105,8 +105,8 @@ void CResourceFileDownloadManager::UpdatePendingDownloads()
 ///////////////////////////////////////////////////////////////
 void CResourceFileDownloadManager::OnRemoveResourceFile(CDownloadableResource* pResourceFile)
 {
-    ListRemove(m_PendingFileDownloadList, pResourceFile);
-    ListRemove(m_ActiveFileDownloadList, pResourceFile);
+    ListRemoveAll(m_PendingFileDownloadList, pResourceFile);
+    ListRemoveAll(m_ActiveFileDownloadList, pResourceFile);
 }
 
 ///////////////////////////////////////////////////////////////

Client/mods/deathmatch/logic/lua/CLuaTimerManager.cpp

@@ -79,8 +79,8 @@ void CLuaTimerManager::RemoveTimer(CLuaTimer* pLuaTimer)
         return;
 
     // Remove all references
-    ListRemove(m_TimerList, pLuaTimer);
-    ListRemove(m_ProcessQueue, pLuaTimer);
+    ListRemoveAll(m_TimerList, pLuaTimer);
+    ListRemoveAll(m_ProcessQueue, pLuaTimer);
 
     if (m_pProcessingTimer == pLuaTimer)
     {

Server/mods/deathmatch/logic/CColManager.cpp

@@ -207,7 +207,7 @@ void CColManager::RemoveFromList(CColShape* pShape)
         }
         else
         {
-            ListRemove(m_List, pShape);
+            ListRemoveAll(m_List, pShape);
         }
     }
 }
@@ -217,7 +217,7 @@ void CColManager::TakeOutTheTrash()
     std::vector<CColShape*>::const_iterator iter = m_TrashCan.begin();
     for (; iter != m_TrashCan.end(); iter++)
     {
-        ListRemove(m_List, *iter);
+        ListRemoveAll(m_List, *iter);
     }
 
     m_TrashCan.clear();

Server/mods/deathmatch/logic/CDatabaseJobQueue.cpp

@@ -365,7 +365,7 @@ bool CDatabaseJobQueueImpl::PollCommand(CDbJobData* pJobData, uint uiTimeout)
         // See if result has come in yet
         if (ListContains(shared.m_ResultQueue, pJobData))
         {
-            ListRemove(shared.m_ResultQueue, pJobData);
+            ListRemoveAll(shared.m_ResultQueue, pJobData);
 
             pJobData->stage = EJobStage::FINISHED;
             MapInsert(m_FinishedList, pJobData);

Server/mods/deathmatch/logic/CObject.cpp

@@ -424,7 +424,7 @@ bool CObject::SetLowLodObject(CObject* pNewLowLodObject)
         assert(ListContains(m_pLowLodObject->m_HighLodObjectList, this));
 
         // Clear there and here
-        ListRemove(m_pLowLodObject->m_HighLodObjectList, this);
+        ListRemoveAll(m_pLowLodObject->m_HighLodObjectList, this);
         m_pLowLodObject = NULL;
         return true;
     }

Server/mods/deathmatch/logic/CPerfStatManager.cpp

@@ -136,7 +136,7 @@ void CPerfStatManagerImpl::AddModule(CPerfStatModule* pModule)
 ///////////////////////////////////////////////////////////////
 void CPerfStatManagerImpl::RemoveModule(CPerfStatModule* pModule)
 {
-    ListRemove(m_ModuleList, pModule);
+    ListRemoveAll(m_ModuleList, pModule);
 }
 
 ///////////////////////////////////////////////////////////////

Server/mods/deathmatch/logic/CRegistryManager.cpp

@@ -41,7 +41,7 @@ bool CRegistryManager::CloseRegistry(CRegistry* pRegistry)
 {
     if (ListContains(m_RegistryList, pRegistry))
     {
-        ListRemove(m_RegistryList, pRegistry);
+        ListRemoveAll(m_RegistryList, pRegistry);
         delete pRegistry;
         return true;
     }

Server/mods/deathmatch/logic/CResource.AclRequest.cpp

@@ -169,7 +169,7 @@ void CResource::RefreshAutoPermissions(CXMLNode* pNodeAclRequest)
         }
 
         // This right is used
-        ListRemove(unusedRightNameMap, request.rightName);
+        ListRemoveAll(unusedRightNameMap, request.rightName);
 
         // Update flag
         bHasPending |= request.bPending;

Server/mods/deathmatch/logic/lua/CLuaCallback.h

@@ -59,7 +59,7 @@ class CLuaCallbackManager
 
     void DestroyCallback(CLuaCallback* pCallback)
     {
-        ListRemove(m_CallbackList, pCallback);
+        ListRemoveAll(m_CallbackList, pCallback);
         delete pCallback;
     }
 

Server/mods/deathmatch/logic/lua/CLuaTimerManager.cpp

@@ -84,8 +84,8 @@ void CLuaTimerManager::RemoveTimer(CLuaTimer* pLuaTimer)
         return;
 
     // Remove all references
-    ListRemove(m_TimerList, pLuaTimer);
-    ListRemove(m_ProcessQueue, pLuaTimer);
+    ListRemoveAll(m_TimerList, pLuaTimer);
+    ListRemoveAll(m_ProcessQueue, pLuaTimer);
 
     if (m_pProcessingTimer == pLuaTimer)
     {

Server/mods/deathmatch/logic/net/CSimPlayerManager.cpp

@@ -90,7 +90,7 @@ void CSimPlayerManager::RemoveSimPlayer(CPlayer* pPlayer)
     for (std::set<CSimPlayer*>::const_iterator iter = m_AllSimPlayerMap.begin(); iter != m_AllSimPlayerMap.end(); ++iter)
     {
         CSimPlayer* pOtherSim = *iter;
-        ListRemove(pOtherSim->m_PuresyncSendListFlat, pSim);
+        ListRemoveAll(pOtherSim->m_PuresyncSendListFlat, pSim);
         pOtherSim->m_bSendListChanged = true;
     }
 

Shared/mods/deathmatch/logic/CLatentTransferManager.cpp

@@ -86,7 +86,7 @@ void CLatentTransferManager::RemoveRemote(NetPlayerID remoteId)
 {
     CLatentSendQueue* pSendQueue = FindSendQueueForRemote(remoteId);
     CLatentReceiver*  pReceiver = FindReceiverForRemote(remoteId);
-    ListRemove(m_SendQueueList, pSendQueue);
+    ListRemoveAll(m_SendQueueList, pSendQueue);
     MapRemove(m_SendQueueMap, remoteId);
 
     SAFE_DELETE(pSendQueue);

Shared/mods/deathmatch/logic/CScriptDebugging.cpp

@@ -362,7 +362,7 @@ void CScriptDebugging::PopLuaMain(CLuaMain* pLuaMain)
 void CScriptDebugging::OnLuaMainDestroy(CLuaMain* pLuaMain)
 {
     dassert(!ListContains(m_LuaMainStack, pLuaMain));
-    ListRemove(m_LuaMainStack, pLuaMain);
+    ListRemoveAll(m_LuaMainStack, pLuaMain);
 }
 
 CLuaMain* CScriptDebugging::GetTopLuaMain()