Fixed SoundOverlapMode and SoundSelectionCycleMode reading, hopefully properly this time

Author: garethyr

Entities/SoundContainer.cpp

@@ -70,10 +70,12 @@ namespace RTE {
 			std::string soundOverlapModeString = reader.ReadPropValue();
 			if (c_SoundOverlapModeMap.find(soundOverlapModeString) != c_SoundOverlapModeMap.end()) {
 				m_SoundOverlapMode = c_SoundOverlapModeMap.find(soundOverlapModeString)->second;
-			} else if (std::stoi(soundOverlapModeString)) {
-				m_SoundOverlapMode = static_cast<SoundOverlapMode>(std::stoi(soundOverlapModeString));
 			} else {
-				reader.ReportError("Cycle mode " + soundOverlapModeString + " is invalid.");
+				try {
+					m_SoundOverlapMode = static_cast<SoundOverlapMode>(std::stoi(soundOverlapModeString));
+				} catch (const std::exception &) {
+					reader.ReportError("Cycle mode " + soundOverlapModeString + " is invalid.");
+				}
 			}
 		} else if (propName == "Immobile") {
 			reader >> m_Immobile;

Entities/SoundSet.cpp

@@ -101,17 +101,21 @@ namespace RTE {
 /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
 	SoundSet::SoundSelectionCycleMode SoundSet::ReadSoundSelectionCycleMode(Reader &reader) {
+		SoundSelectionCycleMode soundSelectionCycleModeToReturn;
 		std::string soundSelectionCycleModeString = reader.ReadPropValue();
 
 		std::unordered_map<std::string, SoundSelectionCycleMode>::const_iterator soundSelectionCycleMode = c_SoundSelectionCycleModeMap.find(soundSelectionCycleModeString);
 		if (soundSelectionCycleMode != c_SoundSelectionCycleModeMap.end()) {
-			return soundSelectionCycleMode->second;
-		} else if (std::stoi(soundSelectionCycleModeString)) {
-			return static_cast<SoundSelectionCycleMode>(std::stoi(soundSelectionCycleModeString));
+			soundSelectionCycleModeToReturn = soundSelectionCycleMode->second;
+		} else {
+			try {
+				soundSelectionCycleModeToReturn = static_cast<SoundSelectionCycleMode>(std::stoi(soundSelectionCycleModeString));
+			} catch (const std::exception &) {
+				reader.ReportError("Sound selection cycle mode " + soundSelectionCycleModeString + " is invalid.");
+			}
 		}
-
-		reader.ReportError("Sound selection cycle mode " + soundSelectionCycleModeString + " is invalid.");
-		return SoundSelectionCycleMode::RANDOM;
+		
+		return soundSelectionCycleModeToReturn;
 	}
 
 /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////