From f0a37abbd11d9fa3cfb4689a9eccac65214dec82 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sat, 10 Nov 2001 06:35:43 +0000
Subject: [PATCH] the server doesn't like think being NIL :/

---
 coop.qc     |  2 +-
 defs.qc     |  2 ++
 rotate.qc   | 12 ++++++------
 speed.qc    |  2 +-
 subs.qc     |  4 ++++
 tfort.qc    |  4 ++--
 triggers.qc |  2 +-
 warlock.qc  |  8 ++++----
 8 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/coop.qc b/coop.qc
index 734e3d6..e556015 100644
--- a/coop.qc
+++ b/coop.qc
@@ -10,7 +10,7 @@ cooperative mode functions
 void() DroppedKeyThink =
 {
 	// let the throwing player pick it up again
-	self.think = NIL;
+	self.think = dont_think;
 	self.touch = key_touch;
 	self.owner = NIL;
 };
diff --git a/defs.qc b/defs.qc
index 7c66056..909a045 100644
--- a/defs.qc
+++ b/defs.qc
@@ -598,6 +598,8 @@ void() SUB_CalcAngleMoveDone;
 void() SUB_UseTargets;
 void() SUB_Remove;
 
+void() dont_think;	// null function for think
+
 
 //
 //	combat.qc
diff --git a/rotate.qc b/rotate.qc
index 3075c07..3b99cf1 100644
--- a/rotate.qc
+++ b/rotate.qc
@@ -288,7 +288,7 @@ void() rotate_entity_think =
          {
          RotateTargetsFinal();
          self.state = STATE_INACTIVE;
-         self.think = NIL;
+         self.think = dont_think;
          return;
          }
 
@@ -319,7 +319,7 @@ void() rotate_entity_use =
          else
             {
             self.state = STATE_INACTIVE;
-            self.think = NIL;
+            self.think = dont_think;
             }
          }
       }
@@ -364,7 +364,7 @@ void() rotate_entity_firstthink =
    else
       {
       self.state = STATE_INACTIVE;
-      self.think = NIL;
+      self.think = dont_think;
       }
    self.use = rotate_entity_use;
    };
@@ -954,7 +954,7 @@ void() rotate_object =
    self.movetype = MOVETYPE_NONE;
    setmodel (self,self.model);
    setsize( self, self.mins, self.maxs );
-   self.think = NIL;
+   self.think = dont_think;
    };
 
 //************************************************
@@ -990,7 +990,7 @@ void() rotate_door_think2 =
       }
 
    sound(self, CHAN_VOICE, self.noise3, 1, ATTN_NORM);
-   self.think = NIL;
+   self.think = dont_think;
 
    RotateTargetsFinal();
    };
@@ -1192,5 +1192,5 @@ void() func_rotate_door =
    setsize( self, self.mins, self.maxs );
    self.state = STATE_CLOSED;
    self.use = rotate_door_use;
-   self.think = NIL;
+   self.think = dont_think;
    };
diff --git a/speed.qc b/speed.qc
index d24f795..d2d0b89 100644
--- a/speed.qc
+++ b/speed.qc
@@ -47,7 +47,7 @@ void() Kick_My_Owner =
 	else
 		bprint(PRINT_HIGH, " was kicked for cheating.\n");
 
-	self.think = NIL;
+	self.think = dont_think;
 	dremove(self);
 };
 
diff --git a/subs.qc b/subs.qc
index 41963ff..7c3d376 100644
--- a/subs.qc
+++ b/subs.qc
@@ -315,3 +315,7 @@ void (void() thinkst) SUB_CheckRefire =
 	self.cnt = 1;
 	self.think = thinkst;
 };
+
+void () dont_think =
+{
+};
diff --git a/tfort.qc b/tfort.qc
index 02620bf..dd124f1 100644
--- a/tfort.qc
+++ b/tfort.qc
@@ -1283,7 +1283,7 @@ void() TeamFortress_GrenadePrimed =
 	newmis.angles = vectoangles(newmis.velocity);
 
 	// set the grenade's thinktime to when the PRIMETIME runs out
-	newmis.think = NIL;
+	newmis.think = dont_think;
 	newmis.nextthink = self.heat;
 
 	// set the think and touches to the appropriate grenade type
@@ -3353,7 +3353,7 @@ void() TeamFortress_ExplodePerson =
 	newmis.angles = vectoangles(newmis.velocity);
 	
 	// set the grenades thinktime to now
-	newmis.think = NIL;
+	newmis.think = dont_think;
 	newmis.nextthink = time + 0.1;
 
 	// set the think and touches to the appropriate grenade type
diff --git a/triggers.qc b/triggers.qc
index f1debaf..7479ff4 100644
--- a/triggers.qc
+++ b/triggers.qc
@@ -523,7 +523,7 @@ void() teleport_use =
 {
 	self.nextthink = time + 0.2;
 	force_retouch = 2;		// make sure even still objects get hit
-	self.think = NIL;
+	self.think = dont_think;
 };
 
 /*QUAKED trigger_teleport (.5 .5 .5) ? PLAYER_ONLY SILENT
diff --git a/warlock.qc b/warlock.qc
index dd238c8..142c5f8 100644
--- a/warlock.qc
+++ b/warlock.qc
@@ -967,10 +967,10 @@ void () kill_my_demon =
 			te.nextthink = time + 0.1;
 
             //-----------------------// NOT NEEDED
-            /*te.th_stand = NIL;
-            te.th_run = NIL;
-            te.th_missile = NIL;
-            te.th_pain = NIL;*/
+            /*te.th_stand = dont_think;
+            te.th_run = dont_think;
+            te.th_missile = dont_think;
+            te.th_pain = dont_think;*/
             //--------------------------//