Skip to content

Commit f49b44f

Browse files
authored
[GEN][ZH] Remove all instances of stopAllAmbientsBy() (#793)
1 parent 70e9eba commit f49b44f

File tree

6 files changed

+0
-24
lines changed

6 files changed

+0
-24
lines changed

Generals/Code/GameEngine/Include/Common/GameAudio.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -152,10 +152,6 @@ class AudioManager : public SubsystemInterface
152152
virtual void resumeAudio( AudioAffect which ) = 0;
153153
virtual void pauseAmbient( Bool shouldPause ) = 0;
154154

155-
// device dependent stops.
156-
virtual void stopAllAmbientsBy( Object* obj ) = 0;
157-
virtual void stopAllAmbientsBy( Drawable* draw ) = 0;
158-
159155
// for focus issues
160156
virtual void loseFocus( void );
161157
virtual void regainFocus( void );

Generals/Code/GameEngine/Source/GameLogic/Object/Die/FXListDie.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,6 @@ void FXListDie::onDie( const DamageInfo *damageInfo )
6565
const FXListDieModuleData* d = getFXListDieModuleData();
6666
if (d->m_defaultDeathFX)
6767
{
68-
// if the object has any ambient sound(s), kill 'em now.
69-
TheAudio->stopAllAmbientsBy(getObject());
7068

7169
if (d->m_orientToObject)
7270
{

Generals/Code/GameEngine/Source/GameLogic/System/GameLogic.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3706,7 +3706,6 @@ void GameLogic::setGamePaused( Bool paused, Bool pauseMusic )
37063706
while( drawable )
37073707
{
37083708
drawable->startAmbientSound();
3709-
TheAudio->stopAllAmbientsBy( drawable );
37103709
drawable = drawable->getNextDrawable();
37113710
}
37123711
}

Generals/Code/GameEngineDevice/Include/MilesAudioDevice/MilesAudioManager.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -167,9 +167,6 @@ class MilesAudioManager : public AudioManager
167167

168168
virtual void killAudioEventImmediately( AudioHandle audioEvent );
169169

170-
virtual void stopAllAmbientsBy( Object *objID );
171-
virtual void stopAllAmbientsBy( Drawable *drawID );
172-
173170
///< Return whether the current audio is playing or not.
174171
///< NOTE NOTE NOTE !!DO NOT USE THIS IN FOR GAMELOGIC PURPOSES!! NOTE NOTE NOTE
175172
virtual Bool isCurrentlyPlaying( AudioHandle handle );

Generals/Code/GameEngineDevice/Source/MilesAudioDevice/MilesAudioManager.cpp

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -652,19 +652,6 @@ void MilesAudioManager::pauseAmbient( Bool shouldPause )
652652

653653
}
654654

655-
//-------------------------------------------------------------------------------------------------
656-
void MilesAudioManager::stopAllAmbientsBy( Object *obj )
657-
{
658-
659-
}
660-
661-
//-------------------------------------------------------------------------------------------------
662-
void MilesAudioManager::stopAllAmbientsBy( Drawable *draw )
663-
{
664-
665-
}
666-
667-
668655
//-------------------------------------------------------------------------------------------------
669656
void MilesAudioManager::playAudioEvent( AudioEventRTS *event )
670657
{

GeneralsMD/Code/GameEngine/Source/GameLogic/System/GameLogic.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4268,7 +4268,6 @@ void GameLogic::setGamePaused( Bool paused, Bool pauseMusic )
42684268
while( drawable )
42694269
{
42704270
drawable->startAmbientSound();
4271-
TheAudio->stopAllAmbientsBy( drawable );
42724271
drawable = drawable->getNextDrawable();
42734272
}
42744273
#endif

0 commit comments

Comments
 (0)