Merge branch 'master' into float

# Conflicts:
#	src/g_hexen/a_fighterplayer.cpp

src/g_hexen/a_fighterplayer.cpp

@@ -27,7 +27,7 @@ static FRandom pr_fpatk ("FPunchAttack");
 
 void AdjustPlayerAngle (AActor *pmo, FTranslatedLineTarget *t)
 {
-	DAngle difference = deltaangle(pmo->Angles.Yaw, t->angleFromSource);
+	DAngle difference = deltaangle(pmo->Angles.Yaw, pmo->_f_AngleTo(t->linetarget););
 	if (fabs(difference) > MAX_ANGLE_ADJUST)
 	{
 		if (difference > 0)

src/p_map.cpp

@@ -4939,7 +4939,7 @@ bool P_TalkFacing(AActor *player)
 		if (t.linetarget != NULL)
 		{
 			if (t.linetarget->health > 0 && // Dead things can't talk.
-				t.linetarget->flags4 & MF4_INCOMBAT && // Fighting things don't talk either.
+				!(t.linetarget->flags4 & MF4_INCOMBAT) && // Fighting things don't talk either.
 				t.linetarget->Conversation != NULL)
 			{
 				// Give the NPC a chance to play a brief animation

src/sound/fmodsound.cpp

@@ -109,6 +109,18 @@ CUSTOM_CVAR (Float, snd_waterlp, 250, CVAR_ARCHIVE|CVAR_GLOBALCONFIG)
 	}
 }
 
+CUSTOM_CVAR (Int, snd_streambuffersize, 64, CVAR_ARCHIVE|CVAR_GLOBALCONFIG)
+{
+	if (self < 16)
+	{
+		self = 16;
+	}
+	else if (self > 1024)
+	{
+		self = 1024;
+	}
+}
+
 #ifndef NO_FMOD
 #if FMOD_VERSION < 0x43400
 #define FMOD_OPENSTATE_PLAYING FMOD_OPENSTATE_STREAMING
@@ -1168,9 +1180,7 @@ bool FMODSoundRenderer::Init()
 	}
 	Sys->set3DSettings(0.5f, 96.f, 1.f);
 	Sys->set3DRolloffCallback(RolloffCallback);
-	// The default is 16k, which periodically starves later FMOD versions
+	Sys->setStreamBufferSize(snd_streambuffersize * 1024, FMOD_TIMEUNIT_RAWBYTES);
-	// when streaming FLAC files.
-	Sys->setStreamBufferSize(64*1024, FMOD_TIMEUNIT_RAWBYTES);
 	snd_sfxvolume.Callback ();
 	return true;
 }

src/textures/multipatchtexture.cpp

@@ -1148,7 +1148,7 @@ void FMultiPatchTexture::ParsePatch(FScanner &sc, TexPart & part, bool silent, i
 					sc.MustGetStringName(",");
 					sc.MustGetNumber();
 					b = sc.Number;
-					sc.MustGetStringName(",");
+					//sc.MustGetStringName(","); This was never supposed to be here. 
 					part.Blend = MAKERGB(r, g, b);
 				}
 				// Blend.a may never be 0 here.