From dcf2c6a09c97c284b6cdff8c791cce8fe03fd69d Mon Sep 17 00:00:00 2001 From: James Haley Date: Fri, 20 Feb 2015 19:50:58 -0600 Subject: Warning fixes Signed/unsigned comparison mismatches --- src/i_sdlmusic.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/i_sdlmusic.c b/src/i_sdlmusic.c index e70b2c05..63a3467a 100644 --- a/src/i_sdlmusic.c +++ b/src/i_sdlmusic.c @@ -422,7 +422,7 @@ static char *GetSubstituteMusicFile(void *data, size_t data_len) sha1_context_t context; sha1_digest_t hash; char *filename; - int i; + unsigned int i; // Don't bother doing a hash if we're never going to find anything. if (subst_music_len == 0) @@ -734,7 +734,8 @@ static void DumpSubstituteConfig(char *filename) char name[9]; byte *data; FILE *fs; - int lumpnum, h; + unsigned int lumpnum; + size_t h; fs = fopen(filename, "w"); -- cgit v1.2.3 From 5160ceb4512b8bb5839df898a4aff0c6779578c5 Mon Sep 17 00:00:00 2001 From: James Haley Date: Fri, 20 Feb 2015 20:01:02 -0600 Subject: Strife sound priority fix The Strife binary has another priority check in the first loop inside S_GetChannel. TODO: Does DOS Doom have this as well? Find out. Resolves issue #506. --- src/strife/s_sound.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/strife/s_sound.c b/src/strife/s_sound.c index 7a919737..d22f84e4 100644 --- a/src/strife/s_sound.c +++ b/src/strife/s_sound.c @@ -277,7 +277,7 @@ static int S_GetChannel(mobj_t *origin, sfxinfo_t *sfxinfo, boolean isvoice) channel_t* c; // Find an open channel - for (cnum=0 ; cnumpriority > channels[cnum].sfxinfo->priority) + return -1; + S_StopChannel(cnum); break; } -- cgit v1.2.3