Merge branch 'ticket/50'

closes #50

Sources/Plasma/FeatureLib/pfPython/cyMiscGlue3.cpp

@@ -777,4 +777,4 @@ void cyMisc::AddPlasmaMethods3(std::vector<PyMethodDef> &methods)
 
 	PYTHON_GLOBAL_METHOD_NOARGS(methods, PtGetUserPath);
 	PYTHON_GLOBAL_METHOD_NOARGS(methods, PtGetInitPath);
-}
+}

Sources/Plasma/FeatureLib/pfPython/cyMiscGlue4.cpp

@@ -853,4 +853,4 @@ void cyMisc::AddPlasmaMethods4(std::vector<PyMethodDef> &methods)
 	PYTHON_GLOBAL_METHOD(methods, PtGetAIAvatarsByModelName);
 	PYTHON_GLOBAL_METHOD(methods, PtForceVaultNodeUpdate);
 	PYTHON_GLOBAL_METHOD(methods, PtVaultDownload);
-}
+}

Sources/Plasma/FeatureLib/pfPython/plPythonSDLModifier.cpp

@@ -474,6 +474,12 @@ void plPythonSDLModifier::IPythonVarToSDL(plStateDataRecord* state, const char*
 		int count = PyTuple_Size(pyVar);
 		plSimpleVarDescriptor::Type type = var->GetSimpleVarDescriptor()->GetType();
 
+		// Ensure that variable length arrays match.
+		if (var->GetSimpleVarDescriptor()->IsVariableLength()) {
+			if (var->GetCount() != count)
+				var->Alloc(count);
+		}
+
 		for (int i = 0; i < count; i++)
 		{
 			PyObject* pyVarItem = PyTuple_GetItem(pyVar, i);

Sources/Plasma/PubUtilLib/plAudio/plWin32Sound.cpp

@@ -117,7 +117,8 @@ void plWin32Sound::Update()
 			uint32_t currentTimeMs = (uint32_t)(GetActualTimeSec() * 1000.0f);
 			if (currentTimeMs <= srtReader->GetLastEntryEndTime()) {
 				while (plSrtEntry* nextEntry = srtReader->GetNextEntryStartingBeforeTime(currentTimeMs)) {
-					if (plgAudioSys::AreSubtitlesEnabled()) {
+					float currVol = QueryCurrVolume();
+					if (plgAudioSys::AreSubtitlesEnabled() && currVol > 0.01f) {
 						// add a plSubtitleMsg to go... to whoever is listening (probably the KI)
 						plSubtitleMsg* msg = new plSubtitleMsg(nextEntry->GetSubtitleText(), nextEntry->GetSpeakerName());
 						msg->Send();