From e5db7c32ba5f0dd0b8fcb2fce1720982c45a9850 Mon Sep 17 00:00:00 2001
From: Spoike <acceptthis@users.sourceforge.net>
Date: Wed, 10 May 2017 05:05:39 +0000
Subject: [PATCH] git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@5102
 fc73d0e0-1445-4013-8a0c-d673dee63da5

---
 engine/Makefile         | 14 +++++++-------
 engine/client/snd_mem.c |  4 ++--
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/engine/Makefile b/engine/Makefile
index 1ccbf917..830bc1d8 100644
--- a/engine/Makefile
+++ b/engine/Makefile
@@ -26,7 +26,7 @@ ZLIBVER=1.2.11
 PNGVER=1.6.29
 OGGVER=1.3.2
 VORBISVER=1.3.5
-SDLVER=2.0.5
+SDL2VER=2.0.5
 SCINTILLAVER=373
 
 #only limited forms of cross-making is supported
@@ -936,8 +936,8 @@ ifeq (win_SDL,$(findstring win,$(FTE_TARGET))$(findstring _SDL,$(FTE_TARGET)))
 	EXEPOSTFIX=.exe
 
 	CC_MACHINE:=$(shell $(CC) -dumpmachine)
-	ARCH_PREDEP=$(BASE_DIR)/libs/SDL2-$(SDLVER)/$(CC_MACHINE)/bin/sdl2-config
-	SDLCONFIG=$(ARCH_PREDEP) --prefix=$(BASE_DIR)/libs/SDL2-$(SDLVER)/$(CC_MACHINE)
+	ARCH_PREDEP=$(BASE_DIR)/libs/SDL2-$(SDL2VER)/$(CC_MACHINE)/bin/sdl2-config
+	SDLCONFIG=$(ARCH_PREDEP) --prefix=$(BASE_DIR)/libs/SDL2-$(SDL2VER)/$(CC_MACHINE)
 	ARCH_CFLAGS=`$(SDLCONFIG) --cflags`
 	
 	#the defaults for sdl come first
@@ -1823,7 +1823,7 @@ clean:
 
 distclean: clean
 	-rm -f droid/ftekeystore
-	-rm -f -r libs/SDL2-$(SDLVER)
+	-rm -f -r libs/SDL2-$(SDL2VER)
 
 
 #################################################
@@ -1992,11 +1992,11 @@ droid-help:
 	@-echo
 	@-echo "Note that 'make droid-rel' will automatically generate a keystore. If you forget the password, just do a 'make dist-clean'."
 
-$(BASE_DIR)/libs/SDL2-2.0.1/i686-w64-mingw32/bin/sdl2-config:
-	wget http://www.libsdl.org/release/SDL2-devel-2.0.1-mingw.tar.gz -O $(BASE_DIR)/sdl2.tar.gz
+$(BASE_DIR)/libs/SDL2-$(SDL2VER)/i686-w64-mingw32/bin/sdl2-config:
+	wget http://www.libsdl.org/release/SDL2-devel-$(SDL2VER)-mingw.tar.gz -O $(BASE_DIR)/sdl2.tar.gz
 	cd $(BASE_DIR)/libs && tar -xvzf $(BASE_DIR)/sdl2.tar.gz
 	rm $(BASE_DIR)/sdl2.tar.gz
-$(BASE_DIR)/libs/SDL2-2.0.1/x86_64-w64-mingw32/bin/sdl2-config: $(BASE_DIR)/libs/SDL2-2.0.1/i686-w64-mingw32/bin/sdl2-config
+$(BASE_DIR)/libs/SDL2-$(SDL2VER)/x86_64-w64-mingw32/bin/sdl2-config: $(BASE_DIR)/libs/SDL2-$(SDL2VER)/i686-w64-mingw32/bin/sdl2-config
 
 
 
diff --git a/engine/client/snd_mem.c b/engine/client/snd_mem.c
index d3d114f1..015bd0aa 100644
--- a/engine/client/snd_mem.c
+++ b/engine/client/snd_mem.c
@@ -648,7 +648,7 @@ qboolean QDECL S_LoadDoomSpeakerSound (sfx_t *s, qbyte *data, size_t datalen, in
 	}
 
 	sc->length = len;
-	sc->loopstart = -1;
+	s->loopstart = -1;
 	sc->numchannels = 1;
 	sc->width = 1;
 	sc->speed = snd_speed;
@@ -748,10 +748,10 @@ static qboolean QDECL S_LoadBrowserFile (sfx_t *s, qbyte *data, size_t datalen,
 {
 	sfxcache_t *sc;
 	s->decoder.buf = sc = BZ_Malloc(sizeof(sfxcache_t) + datalen);
+	s->loopstart = -1;
 	sc->data = (qbyte*)(sc+1);
 	sc->length = datalen;
 	sc->width = 0;	//ie: not pcm
-	sc->loopstart = -1;
 	sc->speed = sndspeed;
 	sc->numchannels = 2;
 	sc->soundoffset = 0;