refactor(audio): Replace some index values with enum values in AudioManager (TheSuperHackers#1364)

Author: xezon

Core/GameEngine/Include/Common/GameAudio.h

@@ -355,7 +355,14 @@ class AudioManager : public SubsystemInterface
 
 		AudioEventRTS *m_silentAudioEvent;
 
-		enum { NUM_VOLUME_TYPES = 4 };
+		enum
+		{
+			VOLUME_TYPE_MUSIC,
+			VOLUME_TYPE_SOUND,
+			VOLUME_TYPE_SOUND3D,
+			VOLUME_TYPE_SPEECH,
+			NUM_VOLUME_TYPES
+		};
 		Real *m_savedValues;
 
 		// Group of 8

Core/GameEngine/Source/Common/Audio/GameAudio.cpp

@@ -1103,10 +1103,10 @@ void AudioManager::loseFocus( void )
 
 	// In this case, make all the audio go silent.
 	m_savedValues = NEW Real[NUM_VOLUME_TYPES];
-	m_savedValues[0] = m_systemMusicVolume;
-	m_savedValues[1] = m_systemSoundVolume;
-	m_savedValues[2] = m_systemSound3DVolume;
-	m_savedValues[3] = m_systemSpeechVolume;
+	m_savedValues[VOLUME_TYPE_MUSIC] = m_systemMusicVolume;
+	m_savedValues[VOLUME_TYPE_SOUND] = m_systemSoundVolume;
+	m_savedValues[VOLUME_TYPE_SOUND3D] = m_systemSound3DVolume;
+	m_savedValues[VOLUME_TYPE_SPEECH] = m_systemSpeechVolume;
 
 	// Now, set them all to 0.
 	setVolume(0.0f, (AudioAffect) (AudioAffect_All | AudioAffect_SystemSetting));
@@ -1115,15 +1115,14 @@ void AudioManager::loseFocus( void )
 //-------------------------------------------------------------------------------------------------
 void AudioManager::regainFocus( void )
 {
-	if (!m_savedValues) {
+	if (!m_savedValues)
 		return;
-	}
 
 	// We got focus back. Restore the previous audio values.
-	setVolume(m_savedValues[0], (AudioAffect) (AudioAffect_Music | AudioAffect_SystemSetting));
-	setVolume(m_savedValues[1], (AudioAffect) (AudioAffect_Sound | AudioAffect_SystemSetting));
-	setVolume(m_savedValues[2], (AudioAffect) (AudioAffect_Sound3D | AudioAffect_SystemSetting));
-	setVolume(m_savedValues[3], (AudioAffect) (AudioAffect_Speech | AudioAffect_SystemSetting));
+	setVolume(m_savedValues[VOLUME_TYPE_MUSIC], (AudioAffect) (AudioAffect_Music | AudioAffect_SystemSetting));
+	setVolume(m_savedValues[VOLUME_TYPE_SOUND], (AudioAffect) (AudioAffect_Sound | AudioAffect_SystemSetting));
+	setVolume(m_savedValues[VOLUME_TYPE_SOUND3D], (AudioAffect) (AudioAffect_Sound3D | AudioAffect_SystemSetting));
+	setVolume(m_savedValues[VOLUME_TYPE_SPEECH], (AudioAffect) (AudioAffect_Speech | AudioAffect_SystemSetting));
 
 	// Now, blow away the old volumes.
 	delete [] m_savedValues;