From 749b5cb2528cdfbf9358fb7b2da6f3cc1479ee6d Mon Sep 17 00:00:00 2001
From: div0 <div0@f962a42d-fe04-0410-a3ab-8c8b0445ebaa>
Date: Sat, 26 Jul 2008 06:14:53 +0000
Subject: [PATCH] warning fix only

git-svn-id: svn://svn.icculus.org/nexuiz/trunk@3920 f962a42d-fe04-0410-a3ab-8c8b0445ebaa
---
 data/Makefile                       | 15 ++++++++-------
 data/qcsrc/menu/nexuiz/serverlist.c | 12 ++++++------
 data/qcsrc/menu/skin.qh             |  2 +-
 3 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/data/Makefile b/data/Makefile
index 0a4908fd5..36134ca85 100644
--- a/data/Makefile
+++ b/data/Makefile
@@ -3,12 +3,13 @@ PERL ?= perl
 PK3NAME ?= `date +../data%Y%m%d.pk3`
 ZIP ?= 7za a -tzip -mx=9
 
+FTEQCCFLAGS ?= -Wall -Wno-mundane -O3
+FTEQCCFLAGS_PROGS ?= 
+FTEQCCFLAGS_MENU ?= 
+
 # NOTE: use -DUSE_FTE instead of -TFTE here!
 # It will automagically add an engine check with -TID and then change back to -TFTE
-QCFLAGS_CSQC ?= 
-
-# to be enabled when possible
-# QCFLAGS_SVQC ?= -TFTE
+FTEQCCFLAGS_CSPROGS ?= 
 
 all: qc
 
@@ -26,13 +27,13 @@ clean:
 	rm -f progs.dat menu.dat csprogs.dat
 
 csprogs.dat: qcsrc/client/*.* qcsrc/common/*.*
-	( cd qcsrc/client; $(FTEQCC) $(QCFLAGS_CSQC) )
+	cd qcsrc/client && $(FTEQCC) $(FTEQCCFLAGS) $(QCFLAGS_CSPROGS)
 
 progs.dat: qcsrc/server/*.* qcsrc/common/*.*
-	( cd qcsrc/server; $(FTEQCC) $(QCFLAGS_SVQC) )
+	cd qcsrc/server && $(FTEQCC) $(FTEQCCFLAGS) $(QCFLAGS_PROGS)
 
 menu.dat: qcsrc/menu/*.* qcsrc/menu/*/*.* qcsrc/common/*.*
-	( cd qcsrc/menu; $(FTEQCC) )
+	cd qcsrc/menu && $(FTEQCC) $(FTEQCCFLAGS) $(FTEQCCFLAGS_MENU)
 
 gfx/menu/default/skinvalues.txt: qcsrc/menu/skin-customizables.inc
 	$(PERL) qcsrc/menu/skin-customizables.inc > gfx/menu/default/skinvalues.txt
diff --git a/data/qcsrc/menu/nexuiz/serverlist.c b/data/qcsrc/menu/nexuiz/serverlist.c
index 83babfbdd..5b6b69f85 100644
--- a/data/qcsrc/menu/nexuiz/serverlist.c
+++ b/data/qcsrc/menu/nexuiz/serverlist.c
@@ -124,17 +124,17 @@ void refreshServerListNexuizServerList(entity me, float mode)
 	else */
 	{
 		float m;
-		m = SLIST_MASK_AND;
+		m = SLIST_MASK_AND - 1;
 		resethostcachemasks();
 		if(!me.filterShowFull)
-			sethostcachemasknumber(m++, SLIST_FIELD_FREESLOTS, 1, SLIST_TEST_GREATEREQUAL);
+			sethostcachemasknumber(++m, SLIST_FIELD_FREESLOTS, 1, SLIST_TEST_GREATEREQUAL);
 		if(!me.filterShowEmpty)
-			sethostcachemasknumber(m++, SLIST_FIELD_NUMHUMANS, 1, SLIST_TEST_GREATEREQUAL);
-		m = SLIST_MASK_OR;
+			sethostcachemasknumber(++m, SLIST_FIELD_NUMHUMANS, 1, SLIST_TEST_GREATEREQUAL);
+		m = SLIST_MASK_OR - 1;
 		if(me.filterString)
 		{
-			sethostcachemaskstring(m++, SLIST_FIELD_NAME, me.filterString, SLIST_TEST_CONTAINS);
-			sethostcachemaskstring(m++, SLIST_FIELD_MAP, me.filterString, SLIST_TEST_CONTAINS);
+			sethostcachemaskstring(++m, SLIST_FIELD_NAME, me.filterString, SLIST_TEST_CONTAINS);
+			sethostcachemaskstring(++m, SLIST_FIELD_MAP, me.filterString, SLIST_TEST_CONTAINS);
 		}
 		sethostcachesort(me.currentSortField, me.currentSortOrder < 0);
 		resorthostcache();
diff --git a/data/qcsrc/menu/skin.qh b/data/qcsrc/menu/skin.qh
index 96463be3e..7dadd3c00 100644
--- a/data/qcsrc/menu/skin.qh
+++ b/data/qcsrc/menu/skin.qh
@@ -13,7 +13,7 @@
 #define SKINBEGIN void Skin_ApplySetting(string key, string value) { switch(key) {
 #define SKINVECTOR(name,def) case #name: SKIN##name = stov(value); break
 #define SKINFLOAT(name,def) case #name: SKIN##name = stof(value); break
-#define SKINSTRING(name,def) break
+#define SKINSTRING(name,def)
 #define SKINEND case "": break; case "//": break; default: print("Invalid key in skin file: ", key, "\n"); } }
 #include "skin-customizables.inc"
 #undef SKINEND
-- 
2.39.2