- Fix printing of number of knife kills

- add a spawn wrapper, so we can guarantee certain fields are
  initialized.  (not that it initializes anything yet)
- removed some commenting that prevented GRUNTY_EXTRA_WEAPONS (a debug
  define) from working
- removed "hacked forcefield gets you teamkills" from BUGS list.

BUGS

@@ -4,7 +4,6 @@
 - "has_sentry" should be a counter, not a flag (allows a second build if you hack and it gets roasted)
 - there appears to be a window between when a teamkill curse respawn is disabled and when they're killed.  it should be removed.
 - through some combination of respawning, respawn guard, and teleporters (not necesarily needed), it's possible to get stuck on another person
-- hacked forcefields get you teamkills
 - the "speed cheat" checker needs to be ripped out, it's kinda useless
 - sometimes rockets go through armor..
 - crashed alot on prozac :/

army.qc

@@ -659,11 +659,11 @@ float() TeleSoldier =
 	newmis.custom_speed = 10; // 10
 	newmis.yaw_speed = 55;
 	
-    //#ifdef GRUNTY_EXTRA_WEAPONS
-    //newmis.weapons_carried = WEAP_AXE + WEAP_SHOTGUN + WEAP_NAILGUN + GRUNTY_EXTRA_WEAPONS;
-    //#else
-    newmis.weapons_carried = WEAP_AXE + WEAP_SHOTGUN + WEAP_NAILGUN;
-    //#endif
+    #ifdef GRUNTY_EXTRA_WEAPONS
+    newmis.weapons_carried = WEAP_AXE | WEAP_SHOTGUN | WEAP_NAILGUN | GRUNTY_EXTRA_WEAPONS;
+    #else
+    newmis.weapons_carried = WEAP_AXE | WEAP_SHOTGUN | WEAP_NAILGUN;
+    #endif
     
     newmis.tf_items = 0;
 	newmis.view_ofs = '0 0 22';

defs.qc

@@ -446,7 +446,7 @@ void(string e) error				= #10;
 void(string e) objerror				= #11;
 float(vector v) vlen				= #12;
 float(vector v) vectoyaw			= #13;
-entity() spawn					= #14;
+entity() real_spawn					= #14;
 void(entity e) remove				= #15;
 
 // sets trace_* globals

defs.qh

@@ -1,4 +1,5 @@
 #include "options.qh"
+#include "spawn.qh"
 
 // because I want a boolean type :)
 #define boolean integer

progs.src

@@ -80,3 +80,4 @@ spectate.qc
 ofnents.qc
 
 waypoint.qc
+spawn.qc

spawn.qc

@@ -0,0 +1,10 @@
+entity () real_spawn;
+
+entity () spawn =
+{
+	local entity ent;
+
+	ent = real_spawn ();
+
+	return ent;
+};

spawn.qh

@@ -0,0 +1 @@
+entity () spawn;

warlock.qc

@@ -79,7 +79,7 @@ void() Menu_Demon =
                   
 
 
-        CenterPrint6(self, st,st2,st3,"\n\n’.. Îïôèéîç                  \n\nËîéæå Ëéììó: ", str1,"¯MAX_KNIFE_BLOOD");
+        CenterPrint6(self, st,st2,st3,"\n\n’.. Îïôèéîç                  \n\nËîéæå Ëéììó: ", str1,"\^/" + ftos (MAX_KNIFE_BLOOD));
 
     }