sorted the methods according to their original locations in the c files.

21 files changed, 186 insertions, 225 deletions

diff --git a/src/jake2/game/monsters/M_Actor.java b/src/jake2/game/monsters/M_Actor.java
index d6c3fc9..8430e27 100644
--- a/src/jake2/game/monsters/M_Actor.java
+++ b/src/jake2/game/monsters/M_Actor.java
@@ -19,10 +19,11 @@
  */
 
 // Created on 11.11.2003 by RST.
-// $Id: M_Actor.java,v 1.2 2005-02-06 18:48:32 salomo Exp $
+// $Id: M_Actor.java,v 1.3 2005-11-16 22:24:52 salomo Exp $
 package jake2.game.monsters;
 
 import jake2.Defines;
+import jake2.game.*;
 import jake2.game.EntDieAdapter;
 import jake2.game.EntPainAdapter;
 import jake2.game.EntThinkAdapter;
@@ -1297,13 +1298,13 @@ public class M_Actor {
                 //		 gi.sound (self, CHAN_VOICE, actor.sound_gib, 1, ATTN_NORM,
                 // 0);
                 for (n = 0; n < 2; n++)
-                    GameAI.ThrowGib(self, "models/objects/gibs/bone/tris.md2",
+                    GameMisc.ThrowGib(self, "models/objects/gibs/bone/tris.md2",
                             damage, Defines.GIB_ORGANIC);
                 for (n = 0; n < 4; n++)
-                    GameAI.ThrowGib(self,
+                    GameMisc.ThrowGib(self,
                             "models/objects/gibs/sm_meat/tris.md2", damage,
                             Defines.GIB_ORGANIC);
-                GameAI.ThrowHead(self, "models/objects/gibs/head2/tris.md2",
+                GameMisc.ThrowHead(self, "models/objects/gibs/head2/tris.md2",
                         damage, Defines.GIB_ORGANIC);
                 self.deadflag = Defines.DEAD_DEAD;
                 return;
diff --git a/src/jake2/game/monsters/M_Berserk.java b/src/jake2/game/monsters/M_Berserk.java
index 2158a51..9f5fa59 100644
--- a/src/jake2/game/monsters/M_Berserk.java
+++ b/src/jake2/game/monsters/M_Berserk.java
@@ -19,21 +19,13 @@
  */
 
 // Created on 11.11.2003 by RST
-// $Id: M_Berserk.java,v 1.2 2005-02-06 18:48:32 salomo Exp $
+
+// $Id: M_Berserk.java,v 1.3 2005-11-16 22:24:52 salomo Exp $
+
 package jake2.game.monsters;
 
 import jake2.Defines;
-import jake2.game.EntDieAdapter;
-import jake2.game.EntInteractAdapter;
-import jake2.game.EntPainAdapter;
-import jake2.game.EntThinkAdapter;
-import jake2.game.Fire;
-import jake2.game.GameAI;
-import jake2.game.GameBase;
-import jake2.game.GameUtil;
-import jake2.game.edict_t;
-import jake2.game.mframe_t;
-import jake2.game.mmove_t;
+import jake2.game.*;
 import jake2.util.Lib;
 import jake2.util.Math3D;
 
@@ -685,7 +677,7 @@ public class M_Berserk {
         public boolean think(edict_t self) {
             float[] aim = { Defines.MELEE_DISTANCE, 0f, -24f };
 
-            Fire.fire_hit(self, aim, (15 + (Lib.rand() % 6)), 400);
+            GameWeapon.fire_hit(self, aim, (15 + (Lib.rand() % 6)), 400);
             //	Faster attack -- upwards and backwards
 
             return true;
@@ -718,7 +710,7 @@ public class M_Berserk {
             float aim[] = { 0, 0, 0 };
 
             Math3D.VectorSet(aim, Defines.MELEE_DISTANCE, self.mins[0], -4);
-            Fire.fire_hit(self, aim, (5 + (Lib.rand() % 6)), 400); // Slower
+            GameWeapon.fire_hit(self, aim, (5 + (Lib.rand() % 6)), 400); // Slower
                                                                    // attack
 
             return true;
@@ -908,13 +900,13 @@ public class M_Berserk {
                                 .soundindex("misc/udeath.wav"), 1,
                                 Defines.ATTN_NORM, 0);
                 for (n = 0; n < 2; n++)
-                    GameAI.ThrowGib(self, "models/objects/gibs/bone/tris.md2",
+                    GameMisc.ThrowGib(self, "models/objects/gibs/bone/tris.md2",
                             damage, Defines.GIB_ORGANIC);
                 for (n = 0; n < 4; n++)
-                    GameAI.ThrowGib(self,
+                    GameMisc.ThrowGib(self,
                             "models/objects/gibs/sm_meat/tris.md2", damage,
                             Defines.GIB_ORGANIC);
-                GameAI.ThrowHead(self, "models/objects/gibs/head2/tris.md2",
+                GameMisc.ThrowHead(self, "models/objects/gibs/head2/tris.md2",
                         damage, Defines.GIB_ORGANIC);
                 self.deadflag = Defines.DEAD_DEAD;
                 return;
diff --git a/src/jake2/game/monsters/M_Boss2.java b/src/jake2/game/monsters/M_Boss2.java
index 5730648..5633398 100644
--- a/src/jake2/game/monsters/M_Boss2.java
+++ b/src/jake2/game/monsters/M_Boss2.java
@@ -19,7 +19,7 @@
  */
 
 // Created on 13.11.2003 by RST.
-// $Id: M_Boss2.java,v 1.2 2005-02-06 18:48:32 salomo Exp $
+// $Id: M_Boss2.java,v 1.3 2005-11-16 22:24:52 salomo Exp $
 package jake2.game.monsters;
 
 import jake2.Defines;
@@ -1013,7 +1013,7 @@ public class M_Boss2 {
             new mframe_t(GameAI.ai_move, 0, null),
             new mframe_t(GameAI.ai_move, 0, null),
             new mframe_t(GameAI.ai_move, 0, null),
-            new mframe_t(GameAI.ai_move, 0, GameAI.BossExplode) };
+            new mframe_t(GameAI.ai_move, 0, M_Supertank.BossExplode) };
 
     /*
      * static EntThinkAdapter xxx = new EntThinkAdapter() { public boolean
diff --git a/src/jake2/game/monsters/M_Boss31.java b/src/jake2/game/monsters/M_Boss31.java
index e267dc2..0c76d56 100644
--- a/src/jake2/game/monsters/M_Boss31.java
+++ b/src/jake2/game/monsters/M_Boss31.java
@@ -19,7 +19,7 @@
  */
 
 // Created on 13.11.2003 by RST.
-// $Id: M_Boss31.java,v 1.2 2005-02-06 18:48:16 salomo Exp $
+// $Id: M_Boss31.java,v 1.3 2005-11-16 22:24:52 salomo Exp $
 package jake2.game.monsters;
 
 import jake2.Defines;
@@ -1079,7 +1079,7 @@ public class M_Boss31 {
             new mframe_t(GameAI.ai_move, 0, null),
             new mframe_t(GameAI.ai_move, 0, null),
             new mframe_t(GameAI.ai_move, 0, M_Boss32.MakronToss),
-            new mframe_t(GameAI.ai_move, 0, GameAI.BossExplode) // 50
+            new mframe_t(GameAI.ai_move, 0, M_Supertank.BossExplode) // 50
     };
 
     static mmove_t jorg_move_death = new mmove_t(FRAME_death01, FRAME_death50,
diff --git a/src/jake2/game/monsters/M_Boss32.java b/src/jake2/game/monsters/M_Boss32.java
index abbe5ba..75e80c1 100644
--- a/src/jake2/game/monsters/M_Boss32.java
+++ b/src/jake2/game/monsters/M_Boss32.java
@@ -19,11 +19,12 @@
  */
 
 // Created on 13.11.2003 by RST.
-// $Id: M_Boss32.java,v 1.2 2005-02-06 18:48:16 salomo Exp $
+// $Id: M_Boss32.java,v 1.3 2005-11-16 22:24:52 salomo Exp $
 package jake2.game.monsters;
 
 import jake2.Defines;
 import jake2.Globals;
+import jake2.game.*;
 import jake2.game.EntDieAdapter;
 import jake2.game.EntInteractAdapter;
 import jake2.game.EntPainAdapter;
@@ -1695,14 +1696,14 @@ public class M_Boss32 {
                                 .soundindex("misc/udeath.wav"), 1,
                                 Defines.ATTN_NORM, 0);
                 for (n = 0; n < 1 /* 4 */; n++)
-                    GameAI.ThrowGib(self,
+                    GameMisc.ThrowGib(self,
                             "models/objects/gibs/sm_meat/tris.md2", damage,
                             Defines.GIB_ORGANIC);
                 for (n = 0; n < 4; n++)
-                    GameAI.ThrowGib(self,
+                    GameMisc.ThrowGib(self,
                             "models/objects/gibs/sm_metal/tris.md2", damage,
                             Defines.GIB_METALLIC);
-                GameAI.ThrowHead(self, "models/objects/gibs/gear/tris.md2",
+                GameMisc.ThrowHead(self, "models/objects/gibs/gear/tris.md2",
                         damage, Defines.GIB_METALLIC);
                 self.deadflag = Defines.DEAD_DEAD;
                 return;
diff --git a/src/jake2/game/monsters/M_Brain.java b/src/jake2/game/monsters/M_Brain.java
index 1339ed2..7189e30 100644
--- a/src/jake2/game/monsters/M_Brain.java
+++ b/src/jake2/game/monsters/M_Brain.java
@@ -19,22 +19,13 @@
  */
 
 // Created on 13.11.2003 by RST.
-// $Id: M_Brain.java,v 1.2 2005-02-06 18:48:14 salomo Exp $
+
+// $Id: M_Brain.java,v 1.3 2005-11-16 22:24:52 salomo Exp $
+
 package jake2.game.monsters;
 
 import jake2.Defines;
-import jake2.game.EntDieAdapter;
-import jake2.game.EntDodgeAdapter;
-import jake2.game.EntInteractAdapter;
-import jake2.game.EntPainAdapter;
-import jake2.game.EntThinkAdapter;
-import jake2.game.Fire;
-import jake2.game.GameAI;
-import jake2.game.GameBase;
-import jake2.game.GameUtil;
-import jake2.game.edict_t;
-import jake2.game.mframe_t;
-import jake2.game.mmove_t;
+import jake2.game.*;
 import jake2.util.Lib;
 import jake2.util.Math3D;
 
@@ -798,7 +789,7 @@ public class M_Brain {
             float[] aim = { 0, 0, 0 };
 
             Math3D.VectorSet(aim, Defines.MELEE_DISTANCE, self.maxs[0], 8);
-            if (Fire.fire_hit(self, aim, (15 + (Lib.rand() % 5)), 40))
+            if (GameWeapon.fire_hit(self, aim, (15 + (Lib.rand() % 5)), 40))
                 GameBase.gi.sound(self, Defines.CHAN_WEAPON, sound_melee3, 1,
                         Defines.ATTN_NORM, 0);
             return true;
@@ -819,7 +810,7 @@ public class M_Brain {
             float[] aim = { 0, 0, 0 };
 
             Math3D.VectorSet(aim, Defines.MELEE_DISTANCE, self.mins[0], 8);
-            if (Fire.fire_hit(self, aim, (15 + (Lib.rand() % 5)), 40))
+            if (GameWeapon.fire_hit(self, aim, (15 + (Lib.rand() % 5)), 40))
                 GameBase.gi.sound(self, Defines.CHAN_WEAPON, sound_melee3, 1,
                         Defines.ATTN_NORM, 0);
 
@@ -843,7 +834,7 @@ public class M_Brain {
             float[] aim = { 0, 0, 0 };
 
             Math3D.VectorSet(aim, Defines.MELEE_DISTANCE, 0, 8);
-            if (Fire.fire_hit(self, aim, (10 + (Lib.rand() % 5)), -600)
+            if (GameWeapon.fire_hit(self, aim, (10 + (Lib.rand() % 5)), -600)
                     && GameBase.skill.value > 0)
                 self.spawnflags |= 65536;
             GameBase.gi.sound(self, Defines.CHAN_WEAPON,
@@ -1069,13 +1060,13 @@ public class M_Brain {
                                 .soundindex("misc/udeath.wav"), 1,
                                 Defines.ATTN_NORM, 0);
                 for (n = 0; n < 2; n++)
-                    GameAI.ThrowGib(self, "models/objects/gibs/bone/tris.md2",
+                    GameMisc.ThrowGib(self, "models/objects/gibs/bone/tris.md2",
                             damage, Defines.GIB_ORGANIC);
                 for (n = 0; n < 4; n++)
-                    GameAI.ThrowGib(self,
+                    GameMisc.ThrowGib(self,
                             "models/objects/gibs/sm_meat/tris.md2", damage,
                             Defines.GIB_ORGANIC);
-                GameAI.ThrowHead(self, "models/objects/gibs/head2/tris.md2",
+                GameMisc.ThrowHead(self, "models/objects/gibs/head2/tris.md2",
                         damage, Defines.GIB_ORGANIC);
                 self.deadflag = Defines.DEAD_DEAD;
                 return;
diff --git a/src/jake2/game/monsters/M_Chick.java b/src/jake2/game/monsters/M_Chick.java
index 32e3c07..be86e8a 100644
--- a/src/jake2/game/monsters/M_Chick.java
+++ b/src/jake2/game/monsters/M_Chick.java
@@ -19,23 +19,13 @@
  */
 
 // Created on 13.11.2003 by RST.
-// $Id: M_Chick.java,v 1.2 2005-02-06 18:48:17 salomo Exp $
+
+// $Id: M_Chick.java,v 1.3 2005-11-16 22:24:52 salomo Exp $
+
 package jake2.game.monsters;
 
 import jake2.Defines;
-import jake2.game.EntDieAdapter;
-import jake2.game.EntDodgeAdapter;
-import jake2.game.EntInteractAdapter;
-import jake2.game.EntPainAdapter;
-import jake2.game.EntThinkAdapter;
-import jake2.game.Fire;
-import jake2.game.GameAI;
-import jake2.game.GameBase;
-import jake2.game.GameUtil;
-import jake2.game.Monster;
-import jake2.game.edict_t;
-import jake2.game.mframe_t;
-import jake2.game.mmove_t;
+import jake2.game.*;
 import jake2.util.Lib;
 import jake2.util.Math3D;
 
@@ -969,13 +959,13 @@ public class M_Chick {
                                 .soundindex("misc/udeath.wav"), 1,
                                 Defines.ATTN_NORM, 0);
                 for (n = 0; n < 2; n++)
-                    GameAI.ThrowGib(self, "models/objects/gibs/bone/tris.md2",
+                    GameMisc.ThrowGib(self, "models/objects/gibs/bone/tris.md2",
                             damage, Defines.GIB_ORGANIC);
                 for (n = 0; n < 4; n++)
-                    GameAI.ThrowGib(self,
+                    GameMisc.ThrowGib(self,
                             "models/objects/gibs/sm_meat/tris.md2", damage,
                             Defines.GIB_ORGANIC);
-                GameAI.ThrowHead(self, "models/objects/gibs/head2/tris.md2",
+                GameMisc.ThrowHead(self, "models/objects/gibs/head2/tris.md2",
                         damage, Defines.GIB_ORGANIC);
                 self.deadflag = Defines.DEAD_DEAD;
                 return;
@@ -1067,7 +1057,7 @@ public class M_Chick {
             Math3D.VectorSet(aim, Defines.MELEE_DISTANCE, self.mins[0], 10);
             GameBase.gi.sound(self, Defines.CHAN_WEAPON, sound_melee_swing, 1,
                     Defines.ATTN_NORM, 0);
-            Fire.fire_hit(self, aim, (10 + (Lib.rand() % 6)), 100);
+            GameWeapon.fire_hit(self, aim, (10 + (Lib.rand() % 6)), 100);
             return true;
         }
     };
diff --git a/src/jake2/game/monsters/M_Flipper.java b/src/jake2/game/monsters/M_Flipper.java
index 14acc59..d8e5b91 100644
--- a/src/jake2/game/monsters/M_Flipper.java
+++ b/src/jake2/game/monsters/M_Flipper.java
@@ -19,15 +19,15 @@
  */
 
 // Created on 13.11.2003 by RST.
-// $Id: M_Flipper.java,v 1.2 2005-02-06 18:48:17 salomo Exp $
+// $Id: M_Flipper.java,v 1.3 2005-11-16 22:24:52 salomo Exp $
 package jake2.game.monsters;
 
 import jake2.Defines;
+import jake2.game.*;
 import jake2.game.EntDieAdapter;
 import jake2.game.EntInteractAdapter;
 import jake2.game.EntPainAdapter;
 import jake2.game.EntThinkAdapter;
-import jake2.game.Fire;
 import jake2.game.GameAI;
 import jake2.game.GameBase;
 import jake2.game.GameUtil;
@@ -532,7 +532,7 @@ public class M_Flipper {
             float[] aim = { 0, 0, 0 };
 
             Math3D.VectorSet(aim, Defines.MELEE_DISTANCE, 0, 0);
-            Fire.fire_hit(self, aim, 5, 0);
+            GameWeapon.fire_hit(self, aim, 5, 0);
             return true;
         }
     };
@@ -701,13 +701,13 @@ public class M_Flipper {
                                 .soundindex("misc/udeath.wav"), 1,
                                 Defines.ATTN_NORM, 0);
                 for (n = 0; n < 2; n++)
-                    GameAI.ThrowGib(self, "models/objects/gibs/bone/tris.md2",
+                    GameMisc.ThrowGib(self, "models/objects/gibs/bone/tris.md2",
                             damage, Defines.GIB_ORGANIC);
                 for (n = 0; n < 2; n++)
-                    GameAI.ThrowGib(self,
+                    GameMisc.ThrowGib(self,
                             "models/objects/gibs/sm_meat/tris.md2", damage,
                             Defines.GIB_ORGANIC);
-                GameAI.ThrowHead(self, "models/objects/gibs/sm_meat/tris.md2",
+                GameMisc.ThrowHead(self, "models/objects/gibs/sm_meat/tris.md2",
                         damage, Defines.GIB_ORGANIC);
                 self.deadflag = Defines.DEAD_DEAD;
                 return;
diff --git a/src/jake2/game/monsters/M_Float.java b/src/jake2/game/monsters/M_Float.java
index 9c6ce07..00882ef 100644
--- a/src/jake2/game/monsters/M_Float.java
+++ b/src/jake2/game/monsters/M_Float.java
@@ -19,16 +19,16 @@
  */
 
 // Created on 13.11.2003 by RST.
-// $Id: M_Float.java,v 1.2 2005-02-06 18:48:17 salomo Exp $
+// $Id: M_Float.java,v 1.3 2005-11-16 22:24:52 salomo Exp $
 package jake2.game.monsters;
 
 import jake2.Defines;
 import jake2.Globals;
+import jake2.game.*;
 import jake2.game.EntDieAdapter;
 import jake2.game.EntInteractAdapter;
 import jake2.game.EntPainAdapter;
 import jake2.game.EntThinkAdapter;
-import jake2.game.Fire;
 import jake2.game.GameAI;
 import jake2.game.GameBase;
 import jake2.game.GameUtil;
@@ -800,7 +800,7 @@ public class M_Float {
 
             GameBase.gi.sound(self, Defines.CHAN_WEAPON, sound_attack3, 1,
                     Defines.ATTN_NORM, 0);
-            Fire.fire_hit(self, aim, 5 + Lib.rand() % 6, -50);
+            GameWeapon.fire_hit(self, aim, 5 + Lib.rand() % 6, -50);
             return true;
         }
     };
@@ -867,7 +867,7 @@ public class M_Float {
             GameBase.gi.WriteByte(1); //sparks
             GameBase.gi.multicast(origin, Defines.MULTICAST_PVS);
 
-            GameUtil.T_Damage(self.enemy, self, self, dir, self.enemy.s.origin,
+            GameCombat.T_Damage(self.enemy, self, self, dir, self.enemy.s.origin,
                     Globals.vec3_origin, 5 + Lib.rand() % 6, -10,
                     Defines.DAMAGE_ENERGY, Defines.MOD_UNKNOWN);
             return true;
@@ -1160,7 +1160,7 @@ public class M_Float {
                 int damage, float[] point) {
             GameBase.gi.sound(self, Defines.CHAN_VOICE, sound_death1, 1,
                     Defines.ATTN_NORM, 0);
-            GameAI.BecomeExplosion1(self);
+            GameMisc.BecomeExplosion1(self);
 
         }
     };
diff --git a/src/jake2/game/monsters/M_Flyer.java b/src/jake2/game/monsters/M_Flyer.java
index 24e1c78..b7af64a 100644
--- a/src/jake2/game/monsters/M_Flyer.java
+++ b/src/jake2/game/monsters/M_Flyer.java
@@ -19,15 +19,15 @@
  */
 
 // Created on 13.11.2003 by RST.
-// $Id: M_Flyer.java,v 1.2 2005-02-06 18:48:17 salomo Exp $
+// $Id: M_Flyer.java,v 1.3 2005-11-16 22:24:52 salomo Exp $
 package jake2.game.monsters;
 
 import jake2.Defines;
+import jake2.game.*;
 import jake2.game.EntDieAdapter;
 import jake2.game.EntInteractAdapter;
 import jake2.game.EntPainAdapter;
 import jake2.game.EntThinkAdapter;
-import jake2.game.Fire;
 import jake2.game.GameAI;
 import jake2.game.GameBase;
 import jake2.game.GameUtil;
@@ -756,7 +756,7 @@ public class M_Flyer {
             float[] aim = { 0, 0, 0 };
 
             Math3D.VectorSet(aim, Defines.MELEE_DISTANCE, self.mins[0], 0);
-            Fire.fire_hit(self, aim, 5, 0);
+            GameWeapon.fire_hit(self, aim, 5, 0);
             GameBase.gi.sound(self, Defines.CHAN_WEAPON, sound_slash, 1,
                     Defines.ATTN_NORM, 0);
             return true;
@@ -768,7 +768,7 @@ public class M_Flyer {
             float[] aim = { 0, 0, 0 };
 
             Math3D.VectorSet(aim, Defines.MELEE_DISTANCE, self.maxs[0], 0);
-            Fire.fire_hit(self, aim, 5, 0);
+            GameWeapon.fire_hit(self, aim, 5, 0);
             GameBase.gi.sound(self, Defines.CHAN_WEAPON, sound_slash, 1,
                     Defines.ATTN_NORM, 0);
             return true;
@@ -905,7 +905,7 @@ public class M_Flyer {
                 int damage, float[] point) {
             GameBase.gi.sound(self, Defines.CHAN_VOICE, sound_die, 1,
                     Defines.ATTN_NORM, 0);
-            GameAI.BecomeExplosion1(self);
+            GameMisc.BecomeExplosion1(self);
         }
     };
 
diff --git a/src/jake2/game/monsters/M_Gladiator.java b/src/jake2/game/monsters/M_Gladiator.java
index a2022ad..4e5bd6d 100644
--- a/src/jake2/game/monsters/M_Gladiator.java
+++ b/src/jake2/game/monsters/M_Gladiator.java
@@ -19,15 +19,15 @@
  */
 
 // Created on 13.11.2003 by RST.
-// $Id: M_Gladiator.java,v 1.2 2005-02-06 18:48:18 salomo Exp $
+// $Id: M_Gladiator.java,v 1.3 2005-11-16 22:24:52 salomo Exp $
 package jake2.game.monsters;
 
 import jake2.Defines;
+import jake2.game.*;
 import jake2.game.EntDieAdapter;
 import jake2.game.EntInteractAdapter;
 import jake2.game.EntPainAdapter;
 import jake2.game.EntThinkAdapter;
-import jake2.game.Fire;
 import jake2.game.GameAI;
 import jake2.game.GameBase;
 import jake2.game.GameUtil;
@@ -359,7 +359,7 @@ public class M_Gladiator {
             float[] aim = { 0, 0, 0 };
 
             Math3D.VectorSet(aim, Defines.MELEE_DISTANCE, self.mins[0], -4);
-            if (Fire.fire_hit(self, aim, (20 + (Lib.rand() % 5)), 300))
+            if (GameWeapon.fire_hit(self, aim, (20 + (Lib.rand() % 5)), 300))
                 GameBase.gi.sound(self, Defines.CHAN_AUTO, sound_cleaver_hit,
                         1, Defines.ATTN_NORM, 0);
             else
@@ -570,13 +570,13 @@ public class M_Gladiator {
                                 .soundindex("misc/udeath.wav"), 1,
                                 Defines.ATTN_NORM, 0);
                 for (n = 0; n < 2; n++)
-                    GameAI.ThrowGib(self, "models/objects/gibs/bone/tris.md2",
+                    GameMisc.ThrowGib(self, "models/objects/gibs/bone/tris.md2",
                             damage, Defines.GIB_ORGANIC);
                 for (n = 0; n < 4; n++)
-                    GameAI.ThrowGib(self,
+                    GameMisc.ThrowGib(self,
                             "models/objects/gibs/sm_meat/tris.md2", damage,
                             Defines.GIB_ORGANIC);
-                GameAI.ThrowHead(self, "models/objects/gibs/head2/tris.md2",
+                GameMisc.ThrowHead(self, "models/objects/gibs/head2/tris.md2",
                         damage, Defines.GIB_ORGANIC);
                 self.deadflag = Defines.DEAD_DEAD;
                 return;
diff --git a/src/jake2/game/monsters/M_Gunner.java b/src/jake2/game/monsters/M_Gunner.java
index 4d80bd8..dd82ddb 100644
--- a/src/jake2/game/monsters/M_Gunner.java
+++ b/src/jake2/game/monsters/M_Gunner.java
@@ -19,10 +19,11 @@
  */
 
 // Created on 13.11.2003 by RST.
-// $Id: M_Gunner.java,v 1.2 2005-02-06 18:48:15 salomo Exp $
+// $Id: M_Gunner.java,v 1.3 2005-11-16 22:24:52 salomo Exp $
 package jake2.game.monsters;
 
 import jake2.Defines;
+import jake2.game.*;
 import jake2.game.EntDieAdapter;
 import jake2.game.EntDodgeAdapter;
 import jake2.game.EntInteractAdapter;
@@ -787,13 +788,13 @@ public class M_Gunner {
                                 .soundindex("misc/udeath.wav"), 1,
                                 Defines.ATTN_NORM, 0);
                 for (n = 0; n < 2; n++)
-                    GameAI.ThrowGib(self, "models/objects/gibs/bone/tris.md2",
+                    GameMisc.ThrowGib(self, "models/objects/gibs/bone/tris.md2",
                             damage, Defines.GIB_ORGANIC);
                 for (n = 0; n < 4; n++)
-                    GameAI.ThrowGib(self,
+                    GameMisc.ThrowGib(self,
                             "models/objects/gibs/sm_meat/tris.md2", damage,
                             Defines.GIB_ORGANIC);
-                GameAI.ThrowHead(self, "models/objects/gibs/head2/tris.md2",
+                GameMisc.ThrowHead(self, "models/objects/gibs/head2/tris.md2",
                         damage, Defines.GIB_ORGANIC);
                 self.deadflag = Defines.DEAD_DEAD;
                 return;
diff --git a/src/jake2/game/monsters/M_Hover.java b/src/jake2/game/monsters/M_Hover.java
index f2d3055..ff8f7b6 100644
--- a/src/jake2/game/monsters/M_Hover.java
+++ b/src/jake2/game/monsters/M_Hover.java
@@ -19,10 +19,11 @@
  */
 
 // Created on 13.11.2003 by RST.
-// $Id: M_Hover.java,v 1.2 2005-02-06 18:48:17 salomo Exp $
+// $Id: M_Hover.java,v 1.3 2005-11-16 22:24:52 salomo Exp $
 package jake2.game.monsters;
 
 import jake2.Defines;
+import jake2.game.*;
 import jake2.game.EntDieAdapter;
 import jake2.game.EntInteractAdapter;
 import jake2.game.EntPainAdapter;
@@ -584,7 +585,7 @@ public class M_Hover {
                 self.nextthink = GameBase.level.time + Defines.FRAMETIME;
                 return true;
             }
-            GameAI.BecomeExplosion1(self);
+            GameMisc.BecomeExplosion1(self);
             return true;
         }
     };
@@ -614,13 +615,13 @@ public class M_Hover {
                                 .soundindex("misc/udeath.wav"), 1,
                                 Defines.ATTN_NORM, 0);
                 for (n = 0; n < 2; n++)
-                    GameAI.ThrowGib(self, "models/objects/gibs/bone/tris.md2",
+                    GameMisc.ThrowGib(self, "models/objects/gibs/bone/tris.md2",
                             damage, Defines.GIB_ORGANIC);
                 for (n = 0; n < 2; n++)
-                    GameAI.ThrowGib(self,
+                    GameMisc.ThrowGib(self,
                             "models/objects/gibs/sm_meat/tris.md2", damage,
                             Defines.GIB_ORGANIC);
-                GameAI.ThrowHead(self, "models/objects/gibs/sm_meat/tris.md2",
+                GameMisc.ThrowHead(self, "models/objects/gibs/sm_meat/tris.md2",
                         damage, Defines.GIB_ORGANIC);
                 self.deadflag = Defines.DEAD_DEAD;
                 return;
diff --git a/src/jake2/game/monsters/M_Infantry.java b/src/jake2/game/monsters/M_Infantry.java
index c0493eb..d4d3bdd 100644
--- a/src/jake2/game/monsters/M_Infantry.java
+++ b/src/jake2/game/monsters/M_Infantry.java
@@ -19,17 +19,17 @@
  */
 
 // Created on 13.11.2003 by RST.
-// $Id: M_Infantry.java,v 1.2 2005-02-06 18:48:14 salomo Exp $
+// $Id: M_Infantry.java,v 1.3 2005-11-16 22:24:52 salomo Exp $
 package jake2.game.monsters;
 
 import jake2.Defines;
 import jake2.client.M;
+import jake2.game.*;
 import jake2.game.EntDieAdapter;
 import jake2.game.EntDodgeAdapter;
 import jake2.game.EntInteractAdapter;
 import jake2.game.EntPainAdapter;
 import jake2.game.EntThinkAdapter;
-import jake2.game.Fire;
 import jake2.game.GameAI;
 import jake2.game.GameBase;
 import jake2.game.GameUtil;
@@ -843,13 +843,13 @@ public class M_Infantry {
                                 .soundindex("misc/udeath.wav"), 1,
                                 Defines.ATTN_NORM, 0);
                 for (n = 0; n < 2; n++)
-                    GameAI.ThrowGib(self, "models/objects/gibs/bone/tris.md2",
+                    GameMisc.ThrowGib(self, "models/objects/gibs/bone/tris.md2",
                             damage, Defines.GIB_ORGANIC);
                 for (n = 0; n < 4; n++)
-                    GameAI.ThrowGib(self,
+                    GameMisc.ThrowGib(self,
                             "models/objects/gibs/sm_meat/tris.md2", damage,
                             Defines.GIB_ORGANIC);
-                GameAI.ThrowHead(self, "models/objects/gibs/head2/tris.md2",
+                GameMisc.ThrowHead(self, "models/objects/gibs/head2/tris.md2",
                         damage, Defines.GIB_ORGANIC);
                 self.deadflag = Defines.DEAD_DEAD;
                 return;
@@ -993,7 +993,7 @@ public class M_Infantry {
             float[] aim = { 0, 0, 0 };
 
             Math3D.VectorSet(aim, Defines.MELEE_DISTANCE, 0, 0);
-            if (Fire.fire_hit(self, aim, (5 + (Lib.rand() % 5)), 50))
+            if (GameWeapon.fire_hit(self, aim, (5 + (Lib.rand() % 5)), 50))
                 GameBase.gi.sound(self, Defines.CHAN_WEAPON, sound_punch_hit,
                         1, Defines.ATTN_NORM, 0);
             return true;
diff --git a/src/jake2/game/monsters/M_Insane.java b/src/jake2/game/monsters/M_Insane.java
index c227c75..51fa113 100644
--- a/src/jake2/game/monsters/M_Insane.java
+++ b/src/jake2/game/monsters/M_Insane.java
@@ -19,10 +19,11 @@
  */
 
 // Created on 13.11.2003 by RST.
-// $Id: M_Insane.java,v 1.2 2005-02-06 18:48:14 salomo Exp $
+// $Id: M_Insane.java,v 1.3 2005-11-16 22:24:52 salomo Exp $
 package jake2.game.monsters;
 
 import jake2.Defines;
+import jake2.game.*;
 import jake2.game.EntDieAdapter;
 import jake2.game.EntPainAdapter;
 import jake2.game.EntThinkAdapter;
@@ -808,13 +809,13 @@ public class M_Insane {
                                 .soundindex("misc/udeath.wav"), 1,
                                 Defines.ATTN_IDLE, 0);
                 for (n = 0; n < 2; n++)
-                    GameAI.ThrowGib(self, "models/objects/gibs/bone/tris.md2",
+                    GameMisc.ThrowGib(self, "models/objects/gibs/bone/tris.md2",
                             damage, Defines.GIB_ORGANIC);
                 for (n = 0; n < 4; n++)
-                    GameAI.ThrowGib(self,
+                    GameMisc.ThrowGib(self,
                             "models/objects/gibs/sm_meat/tris.md2", damage,
                             Defines.GIB_ORGANIC);
-                GameAI.ThrowHead(self, "models/objects/gibs/head2/tris.md2",
+                GameMisc.ThrowHead(self, "models/objects/gibs/head2/tris.md2",
                         damage, Defines.GIB_ORGANIC);
                 self.deadflag = Defines.DEAD_DEAD;
                 return;
diff --git a/src/jake2/game/monsters/M_Medic.java b/src/jake2/game/monsters/M_Medic.java
index ac8eb74..6237e1c 100644
--- a/src/jake2/game/monsters/M_Medic.java
+++ b/src/jake2/game/monsters/M_Medic.java
@@ -19,25 +19,11 @@
  */
 
 // Created on 13.11.2003 by RST.
-// $Id: M_Medic.java,v 1.2 2005-02-06 18:48:32 salomo Exp $
+// $Id: M_Medic.java,v 1.3 2005-11-16 22:24:52 salomo Exp $
 package jake2.game.monsters;
 
 import jake2.Defines;
-import jake2.game.EdictIterator;
-import jake2.game.EntDieAdapter;
-import jake2.game.EntDodgeAdapter;
-import jake2.game.EntInteractAdapter;
-import jake2.game.EntPainAdapter;
-import jake2.game.EntThinkAdapter;
-import jake2.game.GameAI;
-import jake2.game.GameBase;
-import jake2.game.GameSpawn;
-import jake2.game.GameUtil;
-import jake2.game.Monster;
-import jake2.game.edict_t;
-import jake2.game.mframe_t;
-import jake2.game.mmove_t;
-import jake2.game.trace_t;
+import jake2.game.*;
 import jake2.util.Lib;
 import jake2.util.Math3D;
 
@@ -938,13 +924,13 @@ public class M_Medic {
                                 .soundindex("misc/udeath.wav"), 1,
                                 Defines.ATTN_NORM, 0);
                 for (n = 0; n < 2; n++)
-                    GameAI.ThrowGib(self, "models/objects/gibs/bone/tris.md2",
+                    GameMisc.ThrowGib(self, "models/objects/gibs/bone/tris.md2",
                             damage, Defines.GIB_ORGANIC);
                 for (n = 0; n < 4; n++)
-                    GameAI.ThrowGib(self,
+                    GameMisc.ThrowGib(self,
                             "models/objects/gibs/sm_meat/tris.md2", damage,
                             Defines.GIB_ORGANIC);
-                GameAI.ThrowHead(self, "models/objects/gibs/head2/tris.md2",
+                GameMisc.ThrowHead(self, "models/objects/gibs/head2/tris.md2",
                         damage, Defines.GIB_ORGANIC);
                 self.deadflag = Defines.DEAD_DEAD;
                 return;
diff --git a/src/jake2/game/monsters/M_Mutant.java b/src/jake2/game/monsters/M_Mutant.java
index 5fba33b..6683bc9 100644
--- a/src/jake2/game/monsters/M_Mutant.java
+++ b/src/jake2/game/monsters/M_Mutant.java
@@ -19,25 +19,12 @@
  */
 
 // Created on 13.11.2003 by RST.
-// $Id: M_Mutant.java,v 1.2 2005-02-06 18:48:17 salomo Exp $
+// $Id: M_Mutant.java,v 1.3 2005-11-16 22:24:52 salomo Exp $
 package jake2.game.monsters;
 
 import jake2.Defines;
 import jake2.client.M;
-import jake2.game.EntDieAdapter;
-import jake2.game.EntInteractAdapter;
-import jake2.game.EntPainAdapter;
-import jake2.game.EntThinkAdapter;
-import jake2.game.EntTouchAdapter;
-import jake2.game.Fire;
-import jake2.game.GameAI;
-import jake2.game.GameBase;
-import jake2.game.GameUtil;
-import jake2.game.cplane_t;
-import jake2.game.csurface_t;
-import jake2.game.edict_t;
-import jake2.game.mframe_t;
-import jake2.game.mmove_t;
+import jake2.game.*;
 import jake2.util.Lib;
 import jake2.util.Math3D;
 
@@ -612,7 +599,7 @@ public class M_Mutant {
             float[] aim = { 0, 0, 0 };
 
             Math3D.VectorSet(aim, Defines.MELEE_DISTANCE, self.mins[0], 8);
-            if (Fire.fire_hit(self, aim, (10 + (Lib.rand() % 5)), 100))
+            if (GameWeapon.fire_hit(self, aim, (10 + (Lib.rand() % 5)), 100))
                 GameBase.gi.sound(self, Defines.CHAN_WEAPON, sound_hit, 1,
                         Defines.ATTN_NORM, 0);
             else
@@ -627,7 +614,7 @@ public class M_Mutant {
             float[] aim = { 0, 0, 0 };
 
             Math3D.VectorSet(aim, Defines.MELEE_DISTANCE, self.maxs[0], 8);
-            if (Fire.fire_hit(self, aim, (10 + (Lib.rand() % 5)), 100))
+            if (GameWeapon.fire_hit(self, aim, (10 + (Lib.rand() % 5)), 100))
                 GameBase.gi.sound(self, Defines.CHAN_WEAPON, sound_hit2, 1,
                         Defines.ATTN_NORM, 0);
             else
@@ -692,7 +679,7 @@ public class M_Mutant {
                     Math3D.VectorNormalize(normal);
                     Math3D.VectorMA(self.s.origin, self.maxs[0], normal, point);
                     damage = (int) (40 + 10 * Lib.random());
-                    GameUtil.T_Damage(other, self, self, self.velocity, point,
+                    GameCombat.T_Damage(other, self, self, self.velocity, point,
                             normal, damage, damage, 0, Defines.MOD_UNKNOWN);
                 }
             }
@@ -957,13 +944,13 @@ public class M_Mutant {
                                 .soundindex("misc/udeath.wav"), 1,
                                 Defines.ATTN_NORM, 0);
                 for (n = 0; n < 2; n++)
-                    GameAI.ThrowGib(self, "models/objects/gibs/bone/tris.md2",
+                    GameMisc.ThrowGib(self, "models/objects/gibs/bone/tris.md2",
                             damage, Defines.GIB_ORGANIC);
                 for (n = 0; n < 4; n++)
-                    GameAI.ThrowGib(self,
+                    GameMisc.ThrowGib(self,
                             "models/objects/gibs/sm_meat/tris.md2", damage,
                             Defines.GIB_ORGANIC);
-                GameAI.ThrowHead(self, "models/objects/gibs/head2/tris.md2",
+                GameMisc.ThrowHead(self, "models/objects/gibs/head2/tris.md2",
                         damage, Defines.GIB_ORGANIC);
                 self.deadflag = Defines.DEAD_DEAD;
                 return;
diff --git a/src/jake2/game/monsters/M_Parasite.java b/src/jake2/game/monsters/M_Parasite.java
index 34859f6..9aa56e6 100644
--- a/src/jake2/game/monsters/M_Parasite.java
+++ b/src/jake2/game/monsters/M_Parasite.java
@@ -19,11 +19,12 @@
  */
 
 // Created on 13.11.2003 by RST.
-// $Id: M_Parasite.java,v 1.2 2005-02-06 18:48:16 salomo Exp $
+// $Id: M_Parasite.java,v 1.3 2005-11-16 22:24:52 salomo Exp $
 package jake2.game.monsters;
 
 import jake2.Defines;
 import jake2.Globals;
+import jake2.game.*;
 import jake2.game.EntDieAdapter;
 import jake2.game.EntInteractAdapter;
 import jake2.game.EntPainAdapter;
@@ -625,7 +626,7 @@ public class M_Parasite {
             GameBase.gi.multicast(self.s.origin, Defines.MULTICAST_PVS);
 
             Math3D.VectorSubtract(start, end, dir);
-            GameUtil.T_Damage(self.enemy, self, self, dir, self.enemy.s.origin,
+            GameCombat.T_Damage(self.enemy, self, self, dir, self.enemy.s.origin,
                     Globals.vec3_origin, damage, 0,
                     Defines.DAMAGE_NO_KNOCKBACK, Defines.MOD_UNKNOWN);
             return true;
@@ -748,13 +749,13 @@ public class M_Parasite {
                                 .soundindex("misc/udeath.wav"), 1,
                                 Defines.ATTN_NORM, 0);
                 for (n = 0; n < 2; n++)
-                    GameAI.ThrowGib(self, "models/objects/gibs/bone/tris.md2",
+                    GameMisc.ThrowGib(self, "models/objects/gibs/bone/tris.md2",
                             damage, Defines.GIB_ORGANIC);
                 for (n = 0; n < 4; n++)
-                    GameAI.ThrowGib(self,
+                    GameMisc.ThrowGib(self,
                             "models/objects/gibs/sm_meat/tris.md2", damage,
                             Defines.GIB_ORGANIC);
-                GameAI.ThrowHead(self, "models/objects/gibs/head2/tris.md2",
+                GameMisc.ThrowHead(self, "models/objects/gibs/head2/tris.md2",
                         damage, Defines.GIB_ORGANIC);
                 self.deadflag = Defines.DEAD_DEAD;
                 return;
diff --git a/src/jake2/game/monsters/M_Soldier.java b/src/jake2/game/monsters/M_Soldier.java
index a42c9ef..57225f9 100644
--- a/src/jake2/game/monsters/M_Soldier.java
+++ b/src/jake2/game/monsters/M_Soldier.java
@@ -19,10 +19,11 @@
  */
 
 // Created on 13.11.2003 by RST.
-// $Id: M_Soldier.java,v 1.2 2005-02-06 18:48:15 salomo Exp $
+// $Id: M_Soldier.java,v 1.3 2005-11-16 22:24:52 salomo Exp $
 package jake2.game.monsters;
 
 import jake2.Defines;
+import jake2.game.*;
 import jake2.game.EntDieAdapter;
 import jake2.game.EntDodgeAdapter;
 import jake2.game.EntInteractAdapter;
@@ -1040,12 +1041,12 @@ public class M_Soldier {
                                 .soundindex("misc/udeath.wav"), 1,
                                 Defines.ATTN_NORM, 0);
                 for (n = 0; n < 3; n++)
-                    GameAI.ThrowGib(self,
+                    GameMisc.ThrowGib(self,
                             "models/objects/gibs/sm_meat/tris.md2", damage,
                             Defines.GIB_ORGANIC);
-                GameAI.ThrowGib(self, "models/objects/gibs/chest/tris.md2",
+                GameMisc.ThrowGib(self, "models/objects/gibs/chest/tris.md2",
                         damage, Defines.GIB_ORGANIC);
-                GameAI.ThrowHead(self, "models/objects/gibs/head2/tris.md2",
+                GameMisc.ThrowHead(self, "models/objects/gibs/head2/tris.md2",
                         damage, Defines.GIB_ORGANIC);
                 self.deadflag = Defines.DEAD_DEAD;
                 return;
diff --git a/src/jake2/game/monsters/M_Supertank.java b/src/jake2/game/monsters/M_Supertank.java
index b2f18c3..0d724e7 100644
--- a/src/jake2/game/monsters/M_Supertank.java
+++ b/src/jake2/game/monsters/M_Supertank.java
@@ -19,10 +19,11 @@
  */
 
 // Created on 13.11.2003 by RST.
-// $Id: M_Supertank.java,v 1.2 2005-02-06 18:48:32 salomo Exp $
+// $Id: M_Supertank.java,v 1.3 2005-11-16 22:24:52 salomo Exp $
 package jake2.game.monsters;
 
 import jake2.Defines;
+import jake2.game.*;
 import jake2.game.EntDieAdapter;
 import jake2.game.EntPainAdapter;
 import jake2.game.EntThinkAdapter;
@@ -941,7 +942,7 @@ public class M_Supertank {
             new mframe_t(GameAI.ai_move, 0, null),
             new mframe_t(GameAI.ai_move, 0, null),
             new mframe_t(GameAI.ai_move, 0, null),
-            new mframe_t(GameAI.ai_move, 0, GameAI.BossExplode) };
+            new mframe_t(GameAI.ai_move, 0, M_Supertank.BossExplode) };
 
     static mmove_t supertank_move_death = new mmove_t(FRAME_death_1,
             FRAME_death_24, supertank_frames_death1, supertank_dead);
@@ -1196,68 +1197,74 @@ public class M_Supertank {
         }
     };
 
-    void BossExplode(edict_t self) {
-        float[] org = { 0, 0, 0 };
-        int n;
-
-        self.think = GameAI.BossExplode;
-        Math3D.VectorCopy(self.s.origin, org);
-        org[2] += 24 + (Lib.rand() & 15);
-        switch (self.count++) {
-        case 0:
-            org[0] -= 24;
-            org[1] -= 24;
-            break;
-        case 1:
-            org[0] += 24;
-            org[1] += 24;
-            break;
-        case 2:
-            org[0] += 24;
-            org[1] -= 24;
-            break;
-        case 3:
-            org[0] -= 24;
-            org[1] += 24;
-            break;
-        case 4:
-            org[0] -= 48;
-            org[1] -= 48;
-            break;
-        case 5:
-            org[0] += 48;
-            org[1] += 48;
-            break;
-        case 6:
-            org[0] -= 48;
-            org[1] += 48;
-            break;
-        case 7:
-            org[0] += 48;
-            org[1] -= 48;
-            break;
-        case 8:
-            self.s.sound = 0;
-            for (n = 0; n < 4; n++)
-                GameAI.ThrowGib(self, "models/objects/gibs/sm_meat/tris.md2",
-                        500, Defines.GIB_ORGANIC);
-            for (n = 0; n < 8; n++)
-                GameAI.ThrowGib(self, "models/objects/gibs/sm_metal/tris.md2",
-                        500, Defines.GIB_METALLIC);
-            GameAI.ThrowGib(self, "models/objects/gibs/chest/tris.md2", 500,
-                    Defines.GIB_ORGANIC);
-            GameAI.ThrowHead(self, "models/objects/gibs/gear/tris.md2", 500,
-                    Defines.GIB_METALLIC);
-            self.deadflag = Defines.DEAD_DEAD;
-            return;
+    /** Common Boss explode animation. */
+    
+    public static EntThinkAdapter BossExplode = new EntThinkAdapter() {
+        public boolean think(edict_t self) {
+            float[] org = { 0, 0, 0 };
+    
+            int n;
+    
+            self.think = BossExplode;
+            Math3D.VectorCopy(self.s.origin, org);
+            org[2] += 24 + (Lib.rand() & 15);
+            switch (self.count++) {
+            case 0:
+                org[0] -= 24;
+                org[1] -= 24;
+                break;
+            case 1:
+                org[0] += 24;
+                org[1] += 24;
+                break;
+            case 2:
+                org[0] += 24;
+                org[1] -= 24;
+                break;
+            case 3:
+                org[0] -= 24;
+                org[1] += 24;
+                break;
+            case 4:
+                org[0] -= 48;
+                org[1] -= 48;
+                break;
+            case 5:
+                org[0] += 48;
+                org[1] += 48;
+                break;
+            case 6:
+                org[0] -= 48;
+                org[1] += 48;
+                break;
+            case 7:
+                org[0] += 48;
+                org[1] -= 48;
+                break;
+            case 8:
+                self.s.sound = 0;
+                for (n = 0; n < 4; n++)
+                    GameMisc.ThrowGib(self, "models/objects/gibs/sm_meat/tris.md2", 500,
+                            Defines.GIB_ORGANIC);
+                for (n = 0; n < 8; n++)
+                    GameMisc.ThrowGib(self, "models/objects/gibs/sm_metal/tris.md2",
+                            500, Defines.GIB_METALLIC);
+                GameMisc.ThrowGib(self, "models/objects/gibs/chest/tris.md2", 500,
+                        Defines.GIB_ORGANIC);
+                GameMisc.ThrowHead(self, "models/objects/gibs/gear/tris.md2", 500,
+                        Defines.GIB_METALLIC);
+                self.deadflag = Defines.DEAD_DEAD;
+                return true;
+            }
+    
+            GameBase.gi.WriteByte(Defines.svc_temp_entity);
+            GameBase.gi.WriteByte(Defines.TE_EXPLOSION1);
+            GameBase.gi.WritePosition(org);
+            GameBase.gi.multicast(self.s.origin, Defines.MULTICAST_PVS);
+    
+            self.nextthink = GameBase.level.time + 0.1f;
+            return true;
         }
-
-        GameBase.gi.WriteByte(Defines.svc_temp_entity);
-        GameBase.gi.WriteByte(Defines.TE_EXPLOSION1);
-        GameBase.gi.WritePosition(org);
-        GameBase.gi.multicast(self.s.origin, Defines.MULTICAST_PVS);
-
-        self.nextthink = GameBase.level.time + 0.1f;
-    }
+    };
 
 }
\ No newline at end of file
diff --git a/src/jake2/game/monsters/M_Tank.java b/src/jake2/game/monsters/M_Tank.java
index a2def15..62353ac 100644
--- a/src/jake2/game/monsters/M_Tank.java
+++ b/src/jake2/game/monsters/M_Tank.java
@@ -19,10 +19,11 @@
  */
 
 // Created on 13.11.2003 by RST.
-// $Id: M_Tank.java,v 1.2 2005-02-06 18:48:15 salomo Exp $
+// $Id: M_Tank.java,v 1.3 2005-11-16 22:24:52 salomo Exp $
 package jake2.game.monsters;
 
 import jake2.Defines;
+import jake2.game.*;
 import jake2.game.EntDieAdapter;
 import jake2.game.EntInteractAdapter;
 import jake2.game.EntPainAdapter;
@@ -1412,16 +1413,16 @@ public class M_Tank {
                                 .soundindex("misc/udeath.wav"), 1,
                                 Defines.ATTN_NORM, 0);
                 for (n = 0; n < 1 /* 4 */; n++)
-                    GameAI.ThrowGib(self,
+                    GameMisc.ThrowGib(self,
                             "models/objects/gibs/sm_meat/tris.md2", damage,
                             Defines.GIB_ORGANIC);
                 for (n = 0; n < 4; n++)
-                    GameAI.ThrowGib(self,
+                    GameMisc.ThrowGib(self,
                             "models/objects/gibs/sm_metal/tris.md2", damage,
                             Defines.GIB_METALLIC);
-                GameAI.ThrowGib(self, "models/objects/gibs/chest/tris.md2",
+                GameMisc.ThrowGib(self, "models/objects/gibs/chest/tris.md2",
                         damage, Defines.GIB_ORGANIC);
-                GameAI.ThrowHead(self, "models/objects/gibs/gear/tris.md2",
+                GameMisc.ThrowHead(self, "models/objects/gibs/gear/tris.md2",
                         damage, Defines.GIB_METALLIC);
                 self.deadflag = Defines.DEAD_DEAD;
                 return;