Bit of name changes AddSubSoundSet -> AddSoundSet

Author: garethyr

Entities/SoundContainer.cpp

@@ -61,9 +61,9 @@ namespace RTE {
 		if (propName == "AddSound") {
 			m_TopLevelSoundSet.AddSoundData(SoundSet::ReadAndGetSoundData(reader));
 		} else if (propName == "AddSoundSet") {
-			SoundSet subSoundSet;
-			reader >> subSoundSet;
-			m_TopLevelSoundSet.AddSubSoundSet(subSoundSet);
+			SoundSet soundSetToAdd;
+			reader >> soundSetToAdd;
+			m_TopLevelSoundSet.AddSoundSet(soundSetToAdd);
 		} else if (propName == "SoundSelectionCycleMode" || propName == "CycleMode") {
 			m_TopLevelSoundSet.SetSoundSelectionCycleMode(SoundSet::ReadSoundSelectionCycleMode(reader));
 		} else if (propName == "OverlapMode") {

Entities/SoundSet.cpp

@@ -48,9 +48,9 @@ namespace RTE {
 		} else if (propName == "AddSound") {
 			AddSoundData(ReadAndGetSoundData(reader));
 		} else if (propName == "AddSoundSet") {
-			SoundSet subSoundSet;
-			reader >> subSoundSet;
-			AddSubSoundSet(subSoundSet);
+			SoundSet soundSetToAdd;
+			reader >> soundSetToAdd;
+			AddSoundSet(soundSetToAdd);
 		} else {
 			return Serializable::ReadProperty(propName, reader);
 		}

Entities/SoundSet.h

@@ -130,7 +130,7 @@ namespace RTE {
 		/// Adds a copy of the passed in SoundSet as a sub SoundSet of this SoundSet. Ownership IS transferred!
 		/// </summary>
 		/// <param name="soundSetToAdd">A reference to the SoundSet to be copied in as a sub SoundSet of this SoundSet. Ownership IS transferred!</param>
-		void AddSubSoundSet(const SoundSet &soundSetToAdd) { m_SubSoundSets.push_back(soundSetToAdd); }
+		void AddSoundSet(const SoundSet &soundSetToAdd) { m_SubSoundSets.push_back(soundSetToAdd); }
 #pragma endregion
 
 #pragma region Getters and Setters

Managers/LuaMan.cpp

@@ -615,7 +615,7 @@ int LuaMan::Create() {
             .def("SelectNextSounds", &SoundSet::SelectNextSounds)
             .def("AddSound", (void (SoundSet:: *)(std::string const &soundFilePath)) &SoundSet::AddSound)
             .def("AddSound", (void (SoundSet:: *)(std::string const &soundFilePath, const Vector &offset, float minimumAudibleDistance, float attenuationStartDistance)) &SoundSet::AddSound)
-            .def("AddSubSoundSet", &SoundSet::AddSubSoundSet),
+            .def("AddSoundSet", &SoundSet::AddSoundSet),
 
         ABSTRACTLUABINDING(SceneObject, Entity)
             .property("Pos", &SceneObject::GetPos, &SceneObject::SetPos)