From 91ad7f5f2e2883f1cac6399332858d9a32e53548 Mon Sep 17 00:00:00 2001 From: "alexey.lysiuk" Date: Wed, 16 Mar 2016 12:36:42 +0200 Subject: [PATCH 1/4] Fixed broken Strife conversations Check for in-combat flag was inverted See http://forum.zdoom.org/viewtopic.php?t=51224 --- src/p_map.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/p_map.cpp b/src/p_map.cpp index 8c9b21055..aafe2d125 100644 --- a/src/p_map.cpp +++ b/src/p_map.cpp @@ -4940,7 +4940,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 From b20956e2070a71f0581348838a7666c80db45767 Mon Sep 17 00:00:00 2001 From: "alexey.lysiuk" Date: Wed, 16 Mar 2016 15:18:29 +0200 Subject: [PATCH 2/4] Made FMOD Ex stream buffer size customizable Use snd_streambuffersize to set size of stream buffer in KB, default is 64 See http://forum.zdoom.org/viewtopic.php?t=51230 --- src/sound/fmodsound.cpp | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/src/sound/fmodsound.cpp b/src/sound/fmodsound.cpp index 106abd776..d1a4efd17 100644 --- a/src/sound/fmodsound.cpp +++ b/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 - // when streaming FLAC files. - Sys->setStreamBufferSize(64*1024, FMOD_TIMEUNIT_RAWBYTES); + Sys->setStreamBufferSize(snd_streambuffersize * 1024, FMOD_TIMEUNIT_RAWBYTES); snd_sfxvolume.Callback (); return true; } From 9b1442915f6b14ec10eb0d085b41c545210c4f9d Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Wed, 16 Mar 2016 22:32:09 +0100 Subject: [PATCH 3/4] - fixed: AdjustPlayerAngle should not use the angle that gets passed in the attack target struct. This is the actual angle of the attack but this function needs to adjust to the actual direction between player and victim. --- src/g_hexen/a_fighterplayer.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/g_hexen/a_fighterplayer.cpp b/src/g_hexen/a_fighterplayer.cpp index 24d54dd4d..8abf3fa18 100644 --- a/src/g_hexen/a_fighterplayer.cpp +++ b/src/g_hexen/a_fighterplayer.cpp @@ -30,7 +30,7 @@ void AdjustPlayerAngle (AActor *pmo, FTranslatedLineTarget *t) angle_t angle; int difference; - angle = t->angleFromSource; + angle = pmo->AngleTo(t->linetarget); difference = (int)angle - (int)pmo->angle; if (abs(difference) > MAX_ANGLE_ADJUST) { From 9b134a78e37024eced0e5700b0aa158e8a5b7874 Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Wed, 16 Mar 2016 22:42:41 +0100 Subject: [PATCH 4/4] - fixed: The TEXTURES parser wanted a redundant comma after parsing a color. --- src/textures/multipatchtexture.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/textures/multipatchtexture.cpp b/src/textures/multipatchtexture.cpp index 358fde9ea..f33bfa702 100644 --- a/src/textures/multipatchtexture.cpp +++ b/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.