more gmqcc support

diff --git a/Makefile b/Makefile
index 6d0e9a617f2c875c84036faf78a9be5c148ab734..bdac716b79444e302668067c6f62c5b8b8b86c71 100644 (file)
--- 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 48b4fdd31cf695408019ae9dee2b7d1470510ee4..d321d3c478927266a40697a0ff839214171a7fa2 100644 (file)
--- 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;