From 899c54223e0ca6ec96e38d847258c28fc4ca8cb7 Mon Sep 17 00:00:00 2001
From: Spoike <acceptthis@users.sourceforge.net>
Date: Tue, 6 Oct 2020 04:30:48 +0000
Subject: [PATCH] Some build fixes.

git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@5776 fc73d0e0-1445-4013-8a0c-d673dee63da5
---
 build_wip.sh               | 28 +++++++++++++++++++---------
 engine/client/m_download.c |  9 ++++++---
 engine/gl/gl_heightmap.c   |  2 +-
 3 files changed, 26 insertions(+), 13 deletions(-)

diff --git a/build_wip.sh b/build_wip.sh
index c9ca6d43..f43e987b 100755
--- a/build_wip.sh
+++ b/build_wip.sh
@@ -319,23 +319,33 @@ if [ "$BUILD_LINUXx86" != "n" ]; then
 	fi
 
 	if [ -e $BUILDFOLDER/linux_x86/fteqcc32 ]; then
-		echo "Making csaddon + qcmenu"
 		mkdir -p $BUILDFOLDER/csaddon/
 		cd $SVNROOT/quakec
 		cd csaddon/src
+		echo -n "Making csaddon... "
 		$BUILDFOLDER/linux_x86/fteqcc32 -srcfile csaddon.src > $BUILDLOGFOLDER/csaddon.txt
-		cp ../csaddon.dat $BUILDFOLDER/csaddon/
-		cd ..
-		zip -9 $BUILDFOLDER/csaddon/csaddon.pk3 csaddon.dat
+		if [ $? -eq 0 ]; then
+			echo "done"
+			cp ../csaddon.dat $BUILDFOLDER/csaddon/
+			cd ..
+			zip -9 $BUILDFOLDER/csaddon/csaddon.pk3 csaddon.dat
+		else
+			echo "failed"
+		fi
 
 		cd $SVNROOT/quakec
 		cd menusys
+		echo -n "Making menusys... "
 		$BUILDFOLDER/linux_x86/fteqcc32 -srcfile menu.src > $BUILDLOGFOLDER/menu.txt
-		rm -f fteqcc.log
-		zip -q -9 -o -r $BUILDFOLDER/csaddon/menusys_src.zip .
-		cp ../menu.dat $BUILDFOLDER/csaddon/
-		cd ..
-		zip -9 $BUILDFOLDER/csaddon/menusys.pk3 menu.dat
+		if [ $? -eq 0 ]; then
+			echo "done"
+			zip -q -9 -o -r $BUILDFOLDER/csaddon/menusys_src.zip .
+			cp ../menu.dat $BUILDFOLDER/csaddon/
+			cd ..
+			zip -9 $BUILDFOLDER/csaddon/menusys.pk3 menu.dat
+		else
+			echo "failed"
+		fi
 	else
 		echo "Skiping csaddon + qcmenu, no compiler build"
 	fi
diff --git a/engine/client/m_download.c b/engine/client/m_download.c
index 905e8450..0467d320 100644
--- a/engine/client/m_download.c
+++ b/engine/client/m_download.c
@@ -2233,7 +2233,7 @@ static void PM_UpdatePackageList(qboolean autoupdate, int retry)
 	for (i = 0; i < numdownloadablelists; i++)
 	{
 		if (downloadablelist[i].status == SRCSTAT_PENDING)
-			downloadablelist[i].status = SRCSTAT_FAILED;
+			downloadablelist[i].status = SRCSTAT_FAILED_DNS;
 	}
 #else
 	doautoupdate |= autoupdate;
@@ -3533,7 +3533,7 @@ static void PM_PromptApplyChanges(void)
 	}
 }
 #endif
-#ifdef HAVE_CLIENT
+#if defined(HAVE_CLIENT) && defined(WEBCLIENT)
 static void PM_AddSubList_Callback(void *ctx, promptbutton_t opt)
 {
 	if (opt == PROMPT_YES)
@@ -4563,7 +4563,9 @@ static void MD_Source_Draw (int x, int y, struct menucustom_s *c, struct emenu_s
 		break;
 	case SRCSTAT_FAILED_DNS:
 		Draw_FunStringWidth (x, y, "^&0E  ", 48, 2, false);	//yellow
+#ifdef WEBCLIENT
 		Draw_FunStringWidth (x, y, "DNS", 48, 2, false);
+#endif
 		break;
 	case SRCSTAT_FAILED_NORESP:
 		Draw_FunStringWidth (x, y, "^&0E  ", 48, 2, false);	//yellow
@@ -4810,12 +4812,13 @@ static int MD_AddItemsToDownloadMenu(emenu_t *m, int y, const char *pathprefix)
 static void MD_Download_UpdateStatus(struct emenu_s *m)
 {
 	dlmenu_t *info = m->data;
-	int i, y;
+	int y;
 	package_t *p;
 	unsigned int totalpackages=0, selectedpackages=0, addpackages=0, rempackages=0;
 	menuoption_t *si;
 	menubutton_t *b, *d;
 #ifdef WEBCLIENT
+	int i;
 	unsigned int downloads=0;
 	menucustom_t *c;
 #endif
diff --git a/engine/gl/gl_heightmap.c b/engine/gl/gl_heightmap.c
index e181dcb1..2ccd70ba 100644
--- a/engine/gl/gl_heightmap.c
+++ b/engine/gl/gl_heightmap.c
@@ -7962,7 +7962,7 @@ qboolean Terr_ReformEntitiesLump(model_t *mod, heightmap_t *hm, char *entities)
 
 	//patch info
 	brushtex_t *patch_tex=NULL;
-	int	patchsz[2], patchsubdiv[2];
+	int	patchsz[2]={0,0}, patchsubdiv[2]={-1,-1};
 	qcpatchvert_t patch_v[64][64];
 
 #ifdef RUNTIMELIGHTING