Updated LuaMan, NetworkClient and NetworkServer to support new/changed properties

Author: garethyr

Managers/LuaMan.cpp

@@ -554,12 +554,12 @@ int LuaMan::Create()
             .def("HasAnySounds", &SoundContainer::HasAnySounds)
 			.def("IsBeingPlayed", &SoundContainer::IsBeingPlayed)
             .def("Play", (bool (SoundContainer:: *)()) &SoundContainer::Play)
-            .def("Play", (bool (SoundContainer:: *)(float attenuation)) &SoundContainer::Play)
-            .def("Play", (bool (SoundContainer:: *)(float attenuation, int player)) &SoundContainer::Play)
+            .def("Play", (bool (SoundContainer:: *)(const Vector &position)) &SoundContainer::Play)
+            .def("Play", (bool (SoundContainer:: *)(const Vector &position, int player)) &SoundContainer::Play)
             .def("Stop", (bool (SoundContainer:: *)()) &SoundContainer::Stop)
             .def("Stop", (bool (SoundContainer:: *)(int player)) &SoundContainer::Stop)
             .def("AddSound", &SoundContainer::AddSound)
-			.def("UpdateAttenuation", &SoundContainer::UpdateAttenuation)
+			.def("SetPosition", &SoundContainer::SetPosition)
 			.property("Loops", &SoundContainer::GetLoopSetting, &SoundContainer::SetLoopSetting)
             .property("Priority", &SoundContainer::GetPriority, &SoundContainer::SetPriority)
             .property("AffectedByGlobalPitch", &SoundContainer::IsAffectedByGlobalPitch, &SoundContainer::SetAffectedByGlobalPitch),
@@ -1487,7 +1487,7 @@ int LuaMan::Create()
             .def("SetMusicPosition", &AudioMan::SetMusicPosition)
             .def("SetMusicPitch", &AudioMan::SetMusicPitch)
             .property("SoundsVolume", &AudioMan::GetSoundsVolume, &AudioMan::SetSoundsVolume)
-            .def("SetSoundAttenuation", &AudioMan::SetSoundAttenuation)
+            .def("SetSoundPosition", &AudioMan::SetSoundPosition)
             .def("SetSoundPitch", &AudioMan::SetSoundPitch)
             .def("StopAll", &AudioMan::StopMusic)
             .def("PlayMusic", &AudioMan::PlayMusic)
@@ -1497,8 +1497,8 @@ int LuaMan::Create()
             .def("QueueSilence", &AudioMan::QueueSilence)
             .def("ClearMusicQueue", &AudioMan::ClearMusicQueue)
             .def("PlaySound", (SoundContainer *(AudioMan:: *)(const char *filePath)) &AudioMan::PlaySound)
-            .def("PlaySound", (SoundContainer *(AudioMan:: *)(const char *filePath, float attenuation, int player)) &AudioMan::PlaySound)
-            .def("PlaySound", (SoundContainer * (AudioMan:: *)(const char *filePath, float attenuation, int player, int loops, int priority, double pitchOrAffectedByGlobalPitch)) &AudioMan::PlaySound)
+            .def("PlaySound", (SoundContainer *(AudioMan:: *)(const char *filePath, const Vector &position, int player)) &AudioMan::PlaySound)
+            .def("PlaySound", (SoundContainer *(AudioMan:: *)(const char *filePath, const Vector &position, int player, int loops, int priority, double pitchOrAffectedByGlobalPitch, float attenuationStartDistance, bool immobile)) &AudioMan::PlaySound)
             .def("StopSound", (bool (AudioMan:: *)(SoundContainer *soundContainer)) &AudioMan::StopSound)
             .def("StopSound", (bool (AudioMan:: *)(SoundContainer *soundContainer, int player)) &AudioMan::StopSound)
             .def("FadeOutSound", &AudioMan::FadeOutSound),

Managers/NetworkClient.cpp

@@ -690,17 +690,17 @@ namespace RTE
 										soundContainerToHandle->Stop();
 										soundContainerToHandle->Reset();
 									}
-									soundContainerToHandle->Create(sndDataPtr->Loops, sndDataPtr->AffectedByGlobalPitch);
+									soundContainerToHandle->Create(sndDataPtr->Loops, sndDataPtr->AffectedByGlobalPitch, sndDataPtr->AttenuationStartDistance, sndDataPtr->Immobile);
 									for (size_t soundFileHash : sndDataPtr->SoundFileHashes) {
 										if (soundFileHash != 0) { soundContainerToHandle->AddSound(ContentFile::GetPathFromHash(soundFileHash)); }
 									}
-									g_AudioMan.PlaySound(soundContainerToHandle, sndDataPtr->Distance, -1, -1, sndDataPtr->Pitch);
+									g_AudioMan.PlaySound(soundContainerToHandle, Vector(sndDataPtr->Position[0], sndDataPtr->Position[1]), -1, -1, sndDataPtr->Pitch);
 									break;
 								case AudioMan::SOUND_STOP:
 									soundContainerToHandle->Stop();
 									break;
-								case AudioMan::SOUND_SET_ATTENUATION:
-									soundContainerToHandle->UpdateAttenuation(sndDataPtr->Distance);
+								case AudioMan::SOUND_SET_POSITION:
+									soundContainerToHandle->SetPosition(Vector(sndDataPtr->Position[0], sndDataPtr->Position[1]));
 									break;
 								case AudioMan::SOUND_SET_PITCH:
 									g_AudioMan.SetSoundPitch(soundContainerToHandle, sndDataPtr->Pitch);

Managers/NetworkServer.cpp

@@ -1228,10 +1228,13 @@ namespace RTE
 			sndDataPtr->State = (*eItr).State;
 			std::copy(std::begin(eItr->Channels), std::end(eItr->Channels), sndDataPtr->Channels);
 			std::copy(std::begin(eItr->SoundFileHashes), std::end(eItr->SoundFileHashes), sndDataPtr->SoundFileHashes);
-			sndDataPtr->Distance = (*eItr).Distance;
+			sndDataPtr->Position[0] = (*eItr).Position[0];
+			sndDataPtr->Position[1] = (*eItr).Position[1];
 			sndDataPtr->Loops = (*eItr).Loops;
 			sndDataPtr->Pitch = (*eItr).Pitch;
 			sndDataPtr->AffectedByGlobalPitch = (*eItr).AffectedByGlobalPitch;
+			sndDataPtr->AttenuationStartDistance = (*eItr).AttenuationStartDistance;
+			sndDataPtr->Immobile = (*eItr).Immobile;
 			sndDataPtr->FadeOutTime = (*eItr).FadeOutTime;
 
 			msg->SoundEventsCount++;