From 073f1f8a5fb601c4430e737141b937c077edf572 Mon Sep 17 00:00:00 2001 From: Mauller <26652186+Mauller@users.noreply.github.com> Date: Tue, 8 Apr 2025 18:02:37 +0100 Subject: [PATCH 1/2] [ZH] Fix incorrect containers being used in iterator loops --- .../GameEngine/Source/Common/RTS/ResourceGatheringManager.cpp | 4 ++-- .../GameEngine/Source/Common/System/SubsystemInterface.cpp | 2 +- .../Source/MilesAudioDevice/MilesAudioManager.cpp | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/GeneralsMD/Code/GameEngine/Source/Common/RTS/ResourceGatheringManager.cpp b/GeneralsMD/Code/GameEngine/Source/Common/RTS/ResourceGatheringManager.cpp index 1eee4168bd2..4c65fc8cc57 100644 --- a/GeneralsMD/Code/GameEngine/Source/Common/RTS/ResourceGatheringManager.cpp +++ b/GeneralsMD/Code/GameEngine/Source/Common/RTS/ResourceGatheringManager.cpp @@ -213,7 +213,7 @@ Object *ResourceGatheringManager::findBestSupplyCenter( Object *queryObject ) if( dock ) { static const NameKeyType key_centerUpdate = NAMEKEY("SupplyCenterDockUpdate"); - SupplyWarehouseDockUpdate *centerModule = (SupplyWarehouseDockUpdate*)dock->findUpdateModule( key_centerUpdate ); + SupplyCenterDockUpdate *centerModule = (SupplyCenterDockUpdate*)dock->findUpdateModule( key_centerUpdate ); //If remotely okay, let User win. if( centerModule && computeRelativeCost( queryObject, dock, NULL ) != FLT_MAX ) return dock; @@ -234,7 +234,7 @@ Object *ResourceGatheringManager::findBestSupplyCenter( Object *queryObject ) if( currentCenter == NULL ) { - iterator = m_supplyWarehouses.erase( iterator ); + iterator = m_supplyCenters.erase( iterator ); } else { diff --git a/GeneralsMD/Code/GameEngine/Source/Common/System/SubsystemInterface.cpp b/GeneralsMD/Code/GameEngine/Source/Common/System/SubsystemInterface.cpp index 1e7c32c6514..c0f5fdf4590 100644 --- a/GeneralsMD/Code/GameEngine/Source/Common/System/SubsystemInterface.cpp +++ b/GeneralsMD/Code/GameEngine/Source/Common/System/SubsystemInterface.cpp @@ -146,7 +146,7 @@ void SubsystemInterfaceList::addSubsystem(SubsystemInterface* sys) void SubsystemInterfaceList::removeSubsystem(SubsystemInterface* sys) { #ifdef DUMP_PERF_STATS - for (SubsystemList::iterator it = m_allSubsystems.begin(); it != m_subsystems.end(); ++it) + for (SubsystemList::iterator it = m_allSubsystems.begin(); it != m_allSubsystems.end(); ++it) { if ( (*it) == sys) { m_allSubsystems.erase(it); diff --git a/GeneralsMD/Code/GameEngineDevice/Source/MilesAudioDevice/MilesAudioManager.cpp b/GeneralsMD/Code/GameEngineDevice/Source/MilesAudioDevice/MilesAudioManager.cpp index 99168a375e2..f8373631e0c 100644 --- a/GeneralsMD/Code/GameEngineDevice/Source/MilesAudioDevice/MilesAudioManager.cpp +++ b/GeneralsMD/Code/GameEngineDevice/Source/MilesAudioDevice/MilesAudioManager.cpp @@ -2087,9 +2087,9 @@ Bool MilesAudioManager::killLowestPrioritySoundImmediately( AudioEventRTS *event if( playing->m_audioEventRTS && playing->m_audioEventRTS == lowestPriorityEvent ) { - //Release this 3D sound channel immediately because we are going to play another sound in it's place. + //Release this sound channel immediately because we are going to play another sound in it's place. releasePlayingAudio( playing ); - m_playing3DSounds.erase( it ); + m_playingSounds.erase( it ); return TRUE; } } From 3a808cbb82429492bdc53bdc9df7890a69364ab1 Mon Sep 17 00:00:00 2001 From: Mauller <26652186+Mauller@users.noreply.github.com> Date: Tue, 8 Apr 2025 18:03:30 +0100 Subject: [PATCH 2/2] [GEN] Fix incorrect containers being used in iterator loops --- .../GameEngine/Source/Common/RTS/ResourceGatheringManager.cpp | 4 ++-- .../GameEngine/Source/Common/System/SubsystemInterface.cpp | 2 +- .../Source/MilesAudioDevice/MilesAudioManager.cpp | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Generals/Code/GameEngine/Source/Common/RTS/ResourceGatheringManager.cpp b/Generals/Code/GameEngine/Source/Common/RTS/ResourceGatheringManager.cpp index 275d59daf25..3ddc0472b0a 100644 --- a/Generals/Code/GameEngine/Source/Common/RTS/ResourceGatheringManager.cpp +++ b/Generals/Code/GameEngine/Source/Common/RTS/ResourceGatheringManager.cpp @@ -213,7 +213,7 @@ Object *ResourceGatheringManager::findBestSupplyCenter( Object *queryObject ) if( dock ) { static const NameKeyType key_centerUpdate = NAMEKEY("SupplyCenterDockUpdate"); - SupplyWarehouseDockUpdate *centerModule = (SupplyWarehouseDockUpdate*)dock->findUpdateModule( key_centerUpdate ); + SupplyCenterDockUpdate *centerModule = (SupplyCenterDockUpdate*)dock->findUpdateModule( key_centerUpdate ); //If remotely okay, let User win. if( centerModule && computeRelativeCost( queryObject, dock, NULL ) != FLT_MAX ) return dock; @@ -234,7 +234,7 @@ Object *ResourceGatheringManager::findBestSupplyCenter( Object *queryObject ) if( currentCenter == NULL ) { - iterator = m_supplyWarehouses.erase( iterator ); + iterator = m_supplyCenters.erase( iterator ); } else { diff --git a/Generals/Code/GameEngine/Source/Common/System/SubsystemInterface.cpp b/Generals/Code/GameEngine/Source/Common/System/SubsystemInterface.cpp index 5fad4ec9dc1..60d0777a15f 100644 --- a/Generals/Code/GameEngine/Source/Common/System/SubsystemInterface.cpp +++ b/Generals/Code/GameEngine/Source/Common/System/SubsystemInterface.cpp @@ -137,7 +137,7 @@ void SubsystemInterfaceList::addSubsystem(SubsystemInterface* sys) void SubsystemInterfaceList::removeSubsystem(SubsystemInterface* sys) { #ifdef DUMP_PERF_STATS - for (SubsystemList::iterator it = m_allSubsystems.begin(); it != m_subsystems.end(); ++it) + for (SubsystemList::iterator it = m_allSubsystems.begin(); it != m_allSubsystems.end(); ++it) { if ( (*it) == sys) { m_allSubsystems.erase(it); diff --git a/Generals/Code/GameEngineDevice/Source/MilesAudioDevice/MilesAudioManager.cpp b/Generals/Code/GameEngineDevice/Source/MilesAudioDevice/MilesAudioManager.cpp index b5b1656d4f2..dfa6575d846 100644 --- a/Generals/Code/GameEngineDevice/Source/MilesAudioDevice/MilesAudioManager.cpp +++ b/Generals/Code/GameEngineDevice/Source/MilesAudioDevice/MilesAudioManager.cpp @@ -2085,9 +2085,9 @@ Bool MilesAudioManager::killLowestPrioritySoundImmediately( AudioEventRTS *event if( playing->m_audioEventRTS && playing->m_audioEventRTS == lowestPriorityEvent ) { - //Release this 3D sound channel immediately because we are going to play another sound in it's place. + //Release this sound channel immediately because we are going to play another sound in it's place. releasePlayingAudio( playing ); - m_playing3DSounds.erase( it ); + m_playingSounds.erase( it ); return TRUE; } }