From 69002580e69f439a7a3f1eebebb4f4c4e37c1a39 Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Fri, 4 Apr 2008 17:10:15 +0000 Subject: [PATCH] - Forgot to bump min. savegame version for last revision. - Increased limit for demon/melee to 4. SVN r880 (trunk) --- docs/rh-log.txt | 1 + src/s_sound.cpp | 3 ++- src/version.h | 2 +- wadsrc/sndinfo.txt | 1 + 4 files changed, 5 insertions(+), 2 deletions(-) diff --git a/docs/rh-log.txt b/docs/rh-log.txt index 45dab9708..b1f4bf4d2 100644 --- a/docs/rh-log.txt +++ b/docs/rh-log.txt @@ -1,4 +1,5 @@ April 4, 2008 (Changes by Graf Zahl) +- Increased limit for demon/melee to 4. - Fixed: P_CheckSwitchRange accessed invalid memory when testing a one-sided line. - Fixed: P_SpawnPuff assumed that all melee attacks have the same range diff --git a/src/s_sound.cpp b/src/s_sound.cpp index c5d6c67bf..ff7007bef 100644 --- a/src/s_sound.cpp +++ b/src/s_sound.cpp @@ -715,7 +715,8 @@ static void S_StartSound (fixed_t *pt, AActor *mover, int channel, // If this sound doesn't like playing near itself, don't play it if // that's what would happen. - if (NearLimit > 0 && pt != NULL && S_CheckSoundLimit(sfx, pos, NearLimit)) + if (NearLimit > 0 && pt != NULL && mover != players[consoleplayer].camera && + S_CheckSoundLimit(sfx, pos, NearLimit)) return; // Make sure the sound is loaded. diff --git a/src/version.h b/src/version.h index b55de6ae7..601b27e89 100644 --- a/src/version.h +++ b/src/version.h @@ -75,7 +75,7 @@ // SAVESIG should match SAVEVER. // MINSAVEVER is the minimum level snapshot version that can be loaded. -#define MINSAVEVER 854 +#define MINSAVEVER 879 #if SVN_REVISION_NUMBER < MINSAVEVER // Never write a savegame with a version lower than what we need diff --git a/wadsrc/sndinfo.txt b/wadsrc/sndinfo.txt index e50fb9592..d7a23189f 100644 --- a/wadsrc/sndinfo.txt +++ b/wadsrc/sndinfo.txt @@ -313,6 +313,7 @@ demon/active dsdmact demon/pain dsdmpain demon/melee dssgtatk demon/death dssgtdth +$limit demon/melee 4 // Spectre