Cleanup and some minor changes

Author: MaximDude

Entities/SoundContainer.cpp

@@ -28,7 +28,6 @@ namespace RTE {
 		for (std::vector<std::pair<ContentFile, FMOD::Sound *>>::const_iterator itr = reference.m_Sounds.begin(); itr != reference.m_Sounds.end(); ++itr) {
 			m_Sounds.push_back(*itr);
 		}
-
 		m_SelectedSounds = reference.m_SelectedSounds;
 		m_PlayingChannels.clear();
 
@@ -48,19 +47,15 @@ namespace RTE {
 			ContentFile newFile;
 			reader >> newFile;
 			FMOD::Sound *pNewSample = newFile.GetAsSample();
-			if (!pNewSample) {
-				reader.ReportError(std::string("Failed to load the sample from the file"));
-			}
+			if (!pNewSample) { reader.ReportError(std::string("Failed to load the sample from the file")); }
 			m_Sounds.push_back(std::pair<ContentFile, FMOD::Sound *>(newFile, pNewSample));
 		} else if (propName == "AttenuationStartDistance") {
 			reader >> m_AttenuationStartDistance;
 		} else if (propName == "LoopSetting") {
 			reader >> m_Loops;
 		} else if (propName == "Priority") {
 			reader >> m_Priority;
-			if (m_Priority < 0 || m_Priority > 256) {
-				reader.ReportError("SoundContainer priority must be between 256 (lowest priority) and 0 (highest priority).");
-			}
+			if (m_Priority < 0 || m_Priority > 256) { reader.ReportError("SoundContainer priority must be between 256 (lowest priority) and 0 (highest priority)."); }
 		} else if (propName == "AffectedByGlobalPitch") {
 			reader >> m_AffectedByGlobalPitch;
 		} else if (propName == "Immobile") {
@@ -80,17 +75,17 @@ namespace RTE {
 
 		FMOD::Sound *newSample = newFile.GetAsSample(abortGameForInvalidSound);
 		if (newSample) {
-			FMOD_RESULT result = newSample->setMode(m_Loops == 0 ? FMOD_LOOP_OFF : FMOD_LOOP_NORMAL);
-			result = result == FMOD_OK ? newSample->setLoopCount(m_Loops) : result;
+			FMOD_RESULT result = newSample->setMode((m_Loops == 0) ? FMOD_LOOP_OFF : FMOD_LOOP_NORMAL);
+			result = (result == FMOD_OK) ? newSample->setLoopCount(m_Loops) : result;
 			m_Sounds.push_back(std::pair<ContentFile, FMOD::Sound *>(newFile, newSample));
 		}
 	}
 
 /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
-	std::vector<std::size_t> SoundContainer::GetSelectedSoundHashes() {
-		std::vector<std::size_t> soundHashes;
-		for (std::size_t selectedSoundIndex : m_SelectedSounds) {
+	std::vector<size_t> SoundContainer::GetSelectedSoundHashes() {
+		std::vector<size_t> soundHashes;
+		for (size_t selectedSoundIndex : m_SelectedSounds) {
 			soundHashes.push_back(m_Sounds[selectedSoundIndex].first.GetHash());
 		}
 		return soundHashes;
@@ -100,7 +95,7 @@ namespace RTE {
 
 	std::vector<FMOD::Sound *> SoundContainer::GetSelectedSoundObjects() {
  		std::vector<FMOD::Sound *> soundObjects;
-		for (std::size_t selectedSoundIndex : m_SelectedSounds) {
+		for (size_t selectedSoundIndex : m_SelectedSounds) {
 			soundObjects.push_back(m_Sounds[selectedSoundIndex].second);
 		}
 		return soundObjects;
@@ -113,8 +108,7 @@ namespace RTE {
 		if (soundCount == 0) {
 			return false;
 		}
-
-		std::size_t previouslySelectedSound = m_SelectedSounds.size() > 0 ? m_SelectedSounds[0] : 0;
+		size_t previouslySelectedSound = (m_SelectedSounds.size() > 0) ? m_SelectedSounds[0] : 0;
 
 		if (m_SelectedSounds.empty() || soundCount == 1) {
 			m_SelectedSounds.clear();
@@ -124,16 +118,16 @@ namespace RTE {
 			if (soundCount == 2) {
 				m_SelectedSounds.push_back((previouslySelectedSound + 1) % soundCount);
 			} else if (soundCount > 2) {
-				size_t soundToSelect = floorf((float)soundCount * PosRand());
+				size_t soundToSelect = floorf(static_cast<float>(soundCount) * PosRand());
 				// Mix it up again if we got the same sound twice
 				while (soundToSelect == previouslySelectedSound) {
-					soundToSelect = floorf((float)soundCount * PosRand());
+					soundToSelect = floorf(static_cast<float>(soundCount) * PosRand());
 				}
 				m_SelectedSounds.push_back(soundToSelect);
 			}
 		}
 		RTEAssert(m_SelectedSounds.size() > 0 && m_SelectedSounds[0] >= 0 && m_SelectedSounds[0] < soundCount, "Failed to select next sound, either none was selected or the selected sound was invalid.");
-		
+	
 		return true;
 	}
 
@@ -143,12 +137,12 @@ namespace RTE {
 		FMOD_RESULT result = FMOD_OK;
 
 		for (std::vector<std::pair<ContentFile, FMOD::Sound * >>::const_iterator itr = m_Sounds.begin(); itr != m_Sounds.end() && result == FMOD_OK; ++itr) {
-			FMOD_MODE soundMode = m_Loops == 0 ? FMOD_LOOP_OFF : FMOD_LOOP_NORMAL;
-			soundMode |= m_Immobile ? FMOD_3D_HEADRELATIVE : FMOD_3D_WORLDRELATIVE;
+			FMOD_MODE soundMode = (m_Loops == 0) ? FMOD_LOOP_OFF : FMOD_LOOP_NORMAL;
+			(soundMode |= m_Immobile) ? FMOD_3D_HEADRELATIVE : FMOD_3D_WORLDRELATIVE;
 
-			result = result == FMOD_OK ? itr->second->setMode(soundMode) : result;
-			result = result == FMOD_OK ? itr->second->setLoopCount(m_Loops) : result;
-			result = result == FMOD_OK ? itr->second->set3DMinMaxDistance(m_AttenuationStartDistance, 100000) : result;
+			result = (result == FMOD_OK) ? itr->second->setMode(soundMode) : result;
+			result = (result == FMOD_OK) ? itr->second->setLoopCount(m_Loops) : result;
+			result = (result == FMOD_OK) ? itr->second->set3DMinMaxDistance(m_AttenuationStartDistance, 100000) : result;
 		}
 		m_AllSoundPropertiesUpToDate = result == FMOD_OK;
 

Entities/SoundContainer.h

@@ -140,7 +140,7 @@ namespace RTE {
 		/// Gets a vector of hashes of the sounds selected to be played next in this SoundContainer.
 		/// </summary>
 		/// <returns>The currently playing sounds hashes.</returns>
-		std::vector<std::size_t> GetSelectedSoundHashes();
+		std::vector<size_t> GetSelectedSoundHashes();
 
 		/// <summary>
 		/// Gets a vector of the sounds objects selected to be played next in this SoundContainer.
@@ -152,19 +152,19 @@ namespace RTE {
 		/// Gets the channels playing sounds from this SoundContainer.
 		/// </summary>
 		/// <returns>The channels currently being used.</returns>
-		std::unordered_set<unsigned short int> *GetPlayingChannels() { return &m_PlayingChannels; }
+		std::unordered_set<unsigned short> *GetPlayingChannels() { return &m_PlayingChannels; }
 
 		/// <summary>
 		/// Adds a channel index to the SoundContainer's collection of playing channels.
 		/// </summary>
 		/// <param name="channel">The channel index to add.</param>
-		void AddPlayingChannel(unsigned short int channel) { m_PlayingChannels.insert(channel); RTEAssert(m_PlayingChannels.size() <= c_MaxPlayingSoundsPerContainer, "Tried to play more than " + std::to_string(c_MaxPlayingSoundsPerContainer) + " sounds in SoundContainer " + GetPresetName()); }
+		void AddPlayingChannel(unsigned short channel) { m_PlayingChannels.insert(channel); RTEAssert(m_PlayingChannels.size() <= c_MaxPlayingSoundsPerContainer, "Tried to play more than " + std::to_string(c_MaxPlayingSoundsPerContainer) + " sounds in SoundContainer " + GetPresetName()); }
 
 		/// <summary>
 		/// Removes a channel index from the SoundContainer's collection of playing channels.
 		/// </summary>
 		/// <param name="channel">The channel index to remove.</param>
-		void RemovePlayingChannel(unsigned short int channel) { m_PlayingChannels.erase(channel); }
+		void RemovePlayingChannel(unsigned short channel) { m_PlayingChannels.erase(channel); }
 #pragma endregion
 
 #pragma region Sound Property Getters and Setters
@@ -313,9 +313,9 @@ namespace RTE {
 		std::vector<std::pair<ContentFile, FMOD::Sound *>> m_Sounds; // All the FMOD Sound objects in this SoundContainer, paired with their appropriate ContentFile. The sound objects within are owned by the ContentFile static maps
 		std::vector<size_t> m_SelectedSounds; //!< Vector of the indices of all selected sounds
 
-		std::unordered_set<unsigned short int> m_PlayingChannels; //!< The channels this SoundContainer is currently using
+		std::unordered_set<unsigned short> m_PlayingChannels; //!< The channels this SoundContainer is currently using
 
-		float m_AttenuationStartDistance; //!< The distance away from the AudioSystem listenter to start attenuating this sound. Attenuation follows FMOD 3D Inverse Rolloff model.
+		float m_AttenuationStartDistance; //!< The distance away from the AudioSystem listener to start attenuating this sound. Attenuation follows FMOD 3D Inverse roll-off model.
 		int m_Loops; //!< Number of loops (repeats) the SoundContainer's sounds should play when played. 0 means it plays once, -1 means it plays until stopped 
 		int m_Priority; //!< The mixing priority of this SoundContainer's sounds. Higher values are more likely to be heard
 		bool m_AffectedByGlobalPitch; //!< Whether this SoundContainer's sounds should be able to be altered by global pitch changes

GUI/GUISound.cpp

@@ -56,7 +56,7 @@ namespace RTE {
 
 		m_BackButtonPressSound.Create("Base.rte/Sounds/GUIs/BackButtonPress.wav", 0, false, 0, true);
 
-		m_ConfirmSound.Create("Base.rte/Sounds/GUIs/MenuExit2.wav", 0, false, 0, true);
+		m_ConfirmSound.Create("Base.rte/Sounds/GUIs/MenuExit1.wav", 0, false, 0, true);
 
 		m_UserErrorSound.Create("Base.rte/Sounds/GUIs/UserError.wav", 0, false, 0, true);
 
@@ -93,13 +93,13 @@ namespace RTE {
 		m_CameraTravelSound.AddSound("Base.rte/Sounds/GUIs/CameraTravel3.wav");
 
 		//		m_AreaPickedSound.Create("Base.rte/Sounds/GUIs/MenuEnter.wav", 0, false, 0, true);
-		m_AreaPickedSound = m_EnterMenuSound;
+		m_AreaPickedSound = m_ConfirmSound;
 
 		//		m_ObjectPickedSound.Create("Base.rte/Sounds/GUIs/MenuEnter.wav", 0, false, 0, true);
-		m_ObjectPickedSound = m_EnterMenuSound;
+		m_ObjectPickedSound = m_ConfirmSound;
 
 		//		m_PurchaseMadeSound.Create("Base.rte/Sounds/GUIs/MenuEnter.wav", 0, false, 0, true);
-		m_PurchaseMadeSound = m_EnterMenuSound;
+		m_PurchaseMadeSound = m_ConfirmSound;
 
 		m_PlacementBlip.Create("Base.rte/Sounds/GUIs/PlacementBlip.wav", 0, false, 0, true);