r3920 - in trunk/data: . qcsrc/menu qcsrc/menu/nexuiz

[DONOTREPLY at icculus.org]

Author: div0
Date: 2008-07-26 02:14:53 -0400 (Sat, 26 Jul 2008)
New Revision: 3920

Modified:
   trunk/data/Makefile
   trunk/data/qcsrc/menu/nexuiz/serverlist.c
   trunk/data/qcsrc/menu/skin.qh
Log:
warning fix only


Modified: trunk/data/Makefile
===================================================================
--- trunk/data/Makefile	2008-07-26 06:14:31 UTC (rev 3919)
+++ trunk/data/Makefile	2008-07-26 06:14:53 UTC (rev 3920)
@@ -3,13 +3,14 @@
 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 ?= 
+FTEQCCFLAGS_CSPROGS ?= 
 
-# to be enabled when possible
-# QCFLAGS_SVQC ?= -TFTE
-
 all: qc
 
 .PHONY: qc
@@ -26,13 +27,13 @@
 	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

Modified: trunk/data/qcsrc/menu/nexuiz/serverlist.c
===================================================================
--- trunk/data/qcsrc/menu/nexuiz/serverlist.c	2008-07-26 06:14:31 UTC (rev 3919)
+++ trunk/data/qcsrc/menu/nexuiz/serverlist.c	2008-07-26 06:14:53 UTC (rev 3920)
@@ -124,17 +124,17 @@
 	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();

Modified: trunk/data/qcsrc/menu/skin.qh
===================================================================
--- trunk/data/qcsrc/menu/skin.qh	2008-07-26 06:14:31 UTC (rev 3919)
+++ trunk/data/qcsrc/menu/skin.qh	2008-07-26 06:14:53 UTC (rev 3920)
@@ -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