From: Rudolf Polzer <divverent@xonotic.org>
Date: Mon, 17 Dec 2012 15:31:22 +0000 (+0100)
Subject: more gmqcc support
X-Git-Tag: xonotic-v0.7.0~183
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=6b910ced60859dcd096a75e09e6678918e39499a;p=xonotic%2Fxonotic-data.pk3dir.git

more gmqcc support
---

diff --git a/Makefile b/Makefile
index 6d0e9a617..bdac716b7 100644
--- a/Makefile
+++ b/Makefile
@@ -4,10 +4,6 @@ ZIP ?= 7za a -tzip -mx=9
 ZIPEXCLUDE ?= -x\!*.pk3 -xr\!\.svn -x\!qcsrc
 DIFF ?= diff
 
-# NOTE: use -DUSE_FTE instead of -TFTE here!
-# It will automagically add an engine check with -TID and then change back to -TFTE
-FTEQCCFLAGS_CSPROGS ?= 
-
 # xonotic build system overrides this by command line argument to turn off the check-cvars step
 XON_BUILDSYSTEM =
 
diff --git a/qcsrc/server/t_items.qc b/qcsrc/server/t_items.qc
index 48b4fdd31..d321d3c47 100644
--- a/qcsrc/server/t_items.qc
+++ b/qcsrc/server/t_items.qc
@@ -330,6 +330,10 @@ floatfield Item_CounterField(float it)
 		// add more things here (health, armor)
 		default:             error("requested item has no counter field");
 	}
+#ifdef GMQCC
+	// should never happen
+	return health;
+#endif
 }
 
 string Item_CounterFieldName(float it)
@@ -345,6 +349,10 @@ string Item_CounterFieldName(float it)
 		// add more things here (health, armor)
 		default:             error("requested item has no counter field name");
 	}
+#ifdef GMQCC
+	// should never happen
+	return string_null;
+#endif
 }
 
 .float max_armorvalue;