From 37cba10c146952ce35ccf0b0ce2e9cf71abc52fe Mon Sep 17 00:00:00 2001 From: mittorn Date: Mon, 28 Oct 2019 12:07:15 +0700 Subject: [PATCH] lowmemory: fix sentences --- engine/client/cl_parse.c | 4 ++-- engine/common/protocol.h | 6 ++++-- engine/server/sv_game.c | 4 ++-- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/engine/client/cl_parse.c b/engine/client/cl_parse.c index 778203f6..3467b903 100644 --- a/engine/client/cl_parse.c +++ b/engine/client/cl_parse.c @@ -92,7 +92,7 @@ void CL_ParseSoundPacket( sizebuf_t *msg ) char sentenceName[32]; if( FBitSet( flags, SND_SEQUENCE )) - Q_snprintf( sentenceName, sizeof( sentenceName ), "!#%i", sound + MAX_SOUNDS ); + Q_snprintf( sentenceName, sizeof( sentenceName ), "!#%i", sound + MAX_SOUNDS_NONSENTENCE ); else Q_snprintf( sentenceName, sizeof( sentenceName ), "!%i", sound ); handle = S_RegisterSound( sentenceName ); @@ -156,7 +156,7 @@ void CL_ParseRestoreSoundPacket( sizebuf_t *msg ) char sentenceName[32]; if( flags & SND_SEQUENCE ) - Q_snprintf( sentenceName, sizeof( sentenceName ), "!%i", sound + MAX_SOUNDS ); + Q_snprintf( sentenceName, sizeof( sentenceName ), "!%i", sound + MAX_SOUNDS_NONSENTENCE ); else Q_snprintf( sentenceName, sizeof( sentenceName ), "!%i", sound ); handle = S_RegisterSound( sentenceName ); diff --git a/engine/common/protocol.h b/engine/common/protocol.h index c838ab60..491f5598 100644 --- a/engine/common/protocol.h +++ b/engine/common/protocol.h @@ -119,6 +119,7 @@ GNU General Public License for more details. #define MAX_SOUND_BITS 11 #define MAX_SOUNDS (1<= MAX_SOUNDS ) + if( sound_idx >= MAX_SOUNDS_NONSENTENCE ) { SetBits( flags, SND_SENTENCE|SND_SEQUENCE ); - sound_idx -= MAX_SOUNDS; + sound_idx -= MAX_SOUNDS_NONSENTENCE; } else SetBits( flags, SND_SENTENCE ); }