From 8b676fcb73160a4e709cbbbb6ffc7419fe6330cc Mon Sep 17 00:00:00 2001
From: Shpoike <Shpoike@users.noreply.github.com>
Date: Tue, 31 Aug 2021 03:54:22 +0100
Subject: [PATCH] Fix some stuff that got lost when merging historic qs
 changes.

---
 quakespasm/Quake/Makefile.w64   |  7 +++----
 quakespasm/Quake/net_udp.c      |  4 ++--
 quakespasm/Quake/r_alias.c      | 16 +++++++++++-----
 quakespasm/Quake/sys_sdl_unix.c |  4 ++--
 4 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/quakespasm/Quake/Makefile.w64 b/quakespasm/Quake/Makefile.w64
index 0cc2476f..ce7a8a5c 100644
--- a/quakespasm/Quake/Makefile.w64
+++ b/quakespasm/Quake/Makefile.w64
@@ -105,11 +105,11 @@ $(error Invalid MP3LIB setting)
 endif
 endif
 ifeq ($(MP3LIB),mad)
-mp3_obj=snd_mp3
+mp3_obj=snd_mp3.o
 lib_mp3dec=-lmad
 endif
 ifeq ($(MP3LIB),mpg123)
-mp3_obj=snd_mpg123
+mp3_obj=snd_mpg123.o
 lib_mp3dec=-lmpg123
 endif
 ifeq ($(VORBISLIB),vorbis)
@@ -202,8 +202,7 @@ MUSIC_OBJS:= bgmusic.o \
 	snd_wave.o \
 	snd_vorbis.o \
 	snd_opus.o \
-	$(mp3_obj).o \
-	snd_mp3tag.o \
+	$(mp3_obj) \
 	snd_mikmod.o \
 	snd_xmp.o \
 	snd_umx.o
diff --git a/quakespasm/Quake/net_udp.c b/quakespasm/Quake/net_udp.c
index 6eae022b..eb3a5560 100644
--- a/quakespasm/Quake/net_udp.c
+++ b/quakespasm/Quake/net_udp.c
@@ -136,10 +136,10 @@ sys_socket_t UDP4_Listen (qboolean state)
 	{
 		// enable listening
 		if (net_acceptsocket4 == INVALID_SOCKET)
-{
+		{
 			if ((net_acceptsocket4 = UDP4_OpenSocket (net_hostport)) == INVALID_SOCKET)
 				Sys_Error ("UDP4_Listen: Unable to open accept socket");
-}
+		}
 	}
 	else
 	{
diff --git a/quakespasm/Quake/r_alias.c b/quakespasm/Quake/r_alias.c
index e7bab9e3..67f7c225 100644
--- a/quakespasm/Quake/r_alias.c
+++ b/quakespasm/Quake/r_alias.c
@@ -1036,7 +1036,7 @@ void R_DrawAliasModel (entity_t *e)
 {
 	aliasglsl_t *glsl;
 	aliashdr_t	*paliashdr;
-	int			i, anim;
+	int			i, anim, skinnum;
 	gltexture_t	*tx, *fb;
 	lerpdata_t	lerpdata;
 	qboolean	alphatest = !!(e->model->flags & MF_HOLEY);
@@ -1120,16 +1120,22 @@ void R_DrawAliasModel (entity_t *e)
 		//
 		GL_DisableMultitexture();
 		anim = (int)(cl.time*10) & 3;
-		if ((e->skinnum >= paliashdr->numskins) || (e->skinnum < 0))
+		skinnum = e->skinnum;
+		if ((skinnum >= paliashdr->numskins) || (skinnum < 0))
+		{
+			Con_DPrintf ("R_DrawAliasModel: no such skin # %d for '%s'\n", skinnum, e->model->name);
+			// ericw -- display skin 0 for winquake compatibility
+			skinnum = 0;
+		}
+		if (paliashdr->numskins <= 0)
 		{
-			Con_DPrintf ("R_DrawAliasModel: no such skin # %d for '%s'\n", e->skinnum, e->model->name);
 			tx = NULL; // NULL will give the checkerboard texture
 			fb = NULL;
 		}
 		else
 		{
-			tx = paliashdr->gltextures[e->skinnum][anim];
-			fb = paliashdr->fbtextures[e->skinnum][anim];
+			tx = paliashdr->gltextures[skinnum][anim];
+			fb = paliashdr->fbtextures[skinnum][anim];
 		} 
 		if (e->netstate.colormap && !gl_nocolors.value)
 		{
diff --git a/quakespasm/Quake/sys_sdl_unix.c b/quakespasm/Quake/sys_sdl_unix.c
index e8689e9c..5a84bbd0 100644
--- a/quakespasm/Quake/sys_sdl_unix.c
+++ b/quakespasm/Quake/sys_sdl_unix.c
@@ -392,8 +392,6 @@ void Sys_Error (const char *error, ...)
 	va_list		argptr;
 	char		text[1024];
 
-	Con_Redirect(NULL);
-	PR_SwitchQCVM(NULL);
 	host_parms->errstate++;
 
 	va_start (argptr, error);
@@ -401,6 +399,8 @@ void Sys_Error (const char *error, ...)
 	va_end (argptr);
 
 	fputs (errortxt1, stderr);
+	Con_Redirect(NULL);
+	PR_SwitchQCVM(NULL);
 	Host_Shutdown ();
 	fputs (errortxt2, stderr);
 	fputs (text, stderr);