Fixed forwards sound selection cycle mode so it's not crashy and starts from the 1st entry at the start

Bit of cleanup in SelectNextSounds

Author: garethyr

Entities/SoundSet.cpp

@@ -44,7 +44,7 @@ namespace RTE {
 
 	int SoundSet::ReadProperty(std::string propName, Reader &reader) {
 		if (propName == "SoundSelectionCycleMode") {
-			m_SoundSelectionCycleMode = ReadSoundSelectionCycleMode(reader);
+			SetSoundSelectionCycleMode(ReadSoundSelectionCycleMode(reader));
 		} else if (propName == "AddSound") {
 			AddSoundData(ReadAndGetSoundData(reader));
 		} else if (propName == "AddSoundSet") {
@@ -233,6 +233,10 @@ namespace RTE {
 		}
 		int selectedVectorSize = m_CurrentSelection.first == false ? m_SoundData.size() : m_SubSoundSets.size();
 		int unselectedVectorSize = m_CurrentSelection.first == true ? m_SoundData.size() : m_SubSoundSets.size();
+		if (selectedVectorSize == 0 && unselectedVectorSize > 0) {
+			m_CurrentSelection.first = !m_CurrentSelection.first;
+			std::swap(selectedVectorSize, unselectedVectorSize);
+		}
 
 		/// <summary>
 		/// Internal lambda function to pick a random sound that's not the previously played sound. Done to avoid scoping issues inside the switch below.
@@ -256,9 +260,8 @@ namespace RTE {
 		auto selectSoundForwards = [&selectedVectorSize, &unselectedVectorSize, this]() {
 			m_CurrentSelection.second++;
 			if (m_CurrentSelection.second > selectedVectorSize - 1) {
-				m_CurrentSelection = {!m_CurrentSelection.first, 0};
-				std::swap(selectedVectorSize, unselectedVectorSize);
-				if (selectedVectorSize == 0) {
+				m_CurrentSelection.second = 0;
+				if (unselectedVectorSize > 0) {
 					m_CurrentSelection.first = !m_CurrentSelection.first;
 					std::swap(selectedVectorSize, unselectedVectorSize);
 				}
@@ -269,7 +272,7 @@ namespace RTE {
 			case 0:
 				return false;
 			case 1:
-				if (selectedVectorSize == 0) { m_CurrentSelection.first = !m_CurrentSelection.first; }
+				break;
 			case 2:
 				selectSoundForwards();
 				break;

Entities/SoundSet.h

@@ -150,7 +150,7 @@ namespace RTE {
 		/// Sets the SoundSelectionCycleMode for this SoundSet, which is used to determine what SoundSet to select next time SelectNextSounds is called.
 		/// </summary>
 		/// <param name="newSoundSelectionCycleMOde">The new SoundSelectionCycleMode for this SoundSet.</param>
-		void SetSoundSelectionCycleMode(SoundSelectionCycleMode newSoundSelectionCycleMode) { m_SoundSelectionCycleMode = newSoundSelectionCycleMode; }
+		void SetSoundSelectionCycleMode(SoundSelectionCycleMode newSoundSelectionCycleMode) { m_SoundSelectionCycleMode = newSoundSelectionCycleMode; if (m_SoundSelectionCycleMode == SoundSelectionCycleMode::FORWARDS) { m_CurrentSelection.second = -1; } }
 
 		/// <summary>
 		/// Fills the passed in vector with the flattened SoundData in the SoundSet, optionally only getting currently selected SoundData.
@@ -195,7 +195,7 @@ namespace RTE {
 		static const std::unordered_map<std::string, SoundSet::SoundSelectionCycleMode> c_SoundSelectionCycleModeMap; //!< A map of strings to SoundSelectionCycleModes to support string parsing for the SoundCycleMode enum. Populated in the implementing cpp file.
 
 		SoundSelectionCycleMode m_SoundSelectionCycleMode; //!< The SoundSelectionCycleMode for this SoundSet.
-		std::pair<bool, std::size_t> m_CurrentSelection; //!< Whether the currently selection is in the SoundData (false) or SoundSet (true) vector, and its index in the appropriate vector.
+		std::pair<bool, int> m_CurrentSelection; //!< Whether the currently selection is in the SoundData (false) or SoundSet (true) vector, and its index in the appropriate vector.
 
 		std::vector<SoundData> m_SoundData; //!< The SoundData available for selection in this SoundSet.
 		std::vector<SoundSet> m_SubSoundSets; //!< The sub SoundSets available for selection in this SoundSet.