Made LuaMan a friend of SoundSet so it has access to the SubSoundSets property, since the reference getter can't be used with the stl_iterator. Changed luaman accordingly

Changed SoundContainer TopLevelSoundSet getter to a function instead of a property cause a property wasn't working for some reason
Fixed a couple little issues

Author: garethyr

Entities/SoundSet.cpp

@@ -243,7 +243,7 @@ namespace RTE {
 		/// </summary>
 		auto selectSoundForwards = [&selectedVectorSize, &unselectedVectorSize, this]() {
 			m_CurrentSelection.second++;
-			if (m_CurrentSelection.second > selectedVectorSize) {
+			if (m_CurrentSelection.second > selectedVectorSize - 1) {
 				m_CurrentSelection = {!m_CurrentSelection.first, 0};
 				std::swap(selectedVectorSize, unselectedVectorSize);
 				if (selectedVectorSize == 0) {

Entities/SoundSet.h

@@ -3,13 +3,15 @@
 
 #include "Vector.h"
 #include "ContentFile.h"
+#include "LuaMan.h"
 
 namespace RTE {
 
 	/// <summary>
 	/// A set of sounds, and their selection data.
 	/// </summary>
 	class SoundSet : public Serializable {
+		friend class LuaMan;
 
 	public:
 

Managers/LuaMan.cpp

@@ -581,7 +581,6 @@ int LuaMan::Create() {
                 value("RESTART", SoundContainer::SoundOverlapMode::RESTART),
                 value("IGNORE_PLAY", SoundContainer::SoundOverlapMode::IGNORE_PLAY)
             ]
-            .property("TopLevelSoundSet", &SoundContainer::GetTopLevelSoundSet)
             .property("SoundOverlapMode", &SoundContainer::GetSoundOverlapMode, &SoundContainer::SetSoundOverlapMode)
             .property("Immobile", &SoundContainer::IsImmobile, &SoundContainer::SetImmobile)
             .property("AttenuationStartDistance", &SoundContainer::GetAttenuationStartDistance, &SoundContainer::SetAttenuationStartDistance)
@@ -592,6 +591,7 @@ int LuaMan::Create() {
             .property("Volume", &SoundContainer::GetVolume, &SoundContainer::SetVolume)
             .property("Pitch", &SoundContainer::GetPitch, &SoundContainer::SetPitch)
             .def("HasAnySounds", &SoundContainer::HasAnySounds)
+            .def("GetTopLevelSoundSet", &SoundContainer::GetTopLevelSoundSet)
 			.def("IsBeingPlayed", &SoundContainer::IsBeingPlayed)
             .def("Play", (bool (SoundContainer:: *)()) &SoundContainer::Play)
             .def("Play", (bool (SoundContainer:: *)(const int player)) &SoundContainer::Play)
@@ -602,15 +602,15 @@ int LuaMan::Create() {
             .def("Restart", (bool (SoundContainer:: *)()) &SoundContainer::Restart)
             .def("Restart", (bool (SoundContainer:: *)(int player)) &SoundContainer::Restart),
 
-        class_<SoundSet, Serializable>("SoundSet")
+        class_<SoundSet>("SoundSet")
             .def(constructor<>())
             .enum_("SoundSelectionCycleMode")[
                 value("RANDOM", SoundSet::SoundSelectionCycleMode::RANDOM),
                 value("FORWARDS", SoundSet::SoundSelectionCycleMode::FORWARDS),
                 value("ALL", SoundSet::SoundSelectionCycleMode::ALL)
             ]
             .property("SoundSelectionCycleMode", &SoundSet::GetSoundSelectionCycleMode, &SoundSet::SetSoundSelectionCycleMode)
-            .def_readonly("SubSoundSets", &SoundSet::GetSubSoundSets, return_stl_iterator)
+            .def_readonly("SubSoundSets", &SoundSet::m_SubSoundSets, return_stl_iterator)
             .def("HasAnySounds", &SoundSet::HasAnySounds)
             .def("SelectNextSounds", &SoundSet::SelectNextSounds)
             .def("AddSound", (void (SoundSet:: *)(std::string const &soundFilePath)) &SoundSet::AddSound)