part of refactoring the monster files

24 files changed, 332 insertions, 72 deletions

diff --git a/src/jake2/game/M_Actor.java b/src/jake2/game/monsters/M_Actor.java
index 1e5ef59..d6c3fc9 100644
--- a/src/jake2/game/M_Actor.java
+++ b/src/jake2/game/monsters/M_Actor.java
@@ -19,10 +19,24 @@
  */
 
 // Created on 11.11.2003 by RST.
-// $Id: M_Actor.java,v 1.4 2004-09-22 19:22:01 salomo Exp $
-package jake2.game;
+// $Id: M_Actor.java,v 1.2 2005-02-06 18:48:32 salomo Exp $
+package jake2.game.monsters;
 
 import jake2.Defines;
+import jake2.game.EntDieAdapter;
+import jake2.game.EntPainAdapter;
+import jake2.game.EntThinkAdapter;
+import jake2.game.EntTouchAdapter;
+import jake2.game.EntUseAdapter;
+import jake2.game.GameAI;
+import jake2.game.GameBase;
+import jake2.game.GameUtil;
+import jake2.game.Monster;
+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.util.Lib;
 import jake2.util.Math3D;
 
@@ -1503,7 +1517,7 @@ public class M_Actor {
      * QUAKED misc_actor (1 .5 0) (-16 -16 -24) (16 16 32)
      */
 
-    static void SP_misc_actor(edict_t self) {
+    public static void SP_misc_actor(edict_t self) {
         if (GameBase.deathmatch.value != 0) {
             GameUtil.G_FreeEdict(self);
             return;
@@ -1557,7 +1571,7 @@ public class M_Actor {
         self.use = actor_use;
     }
 
-    static void SP_target_actor(edict_t self) {
+    public static void SP_target_actor(edict_t self) {
         if (self.targetname != null)
             GameBase.gi.dprintf(self.classname + " with no targetname at "
                     + Lib.vtos(self.s.origin) + " \n");
diff --git a/src/jake2/game/M_Berserk.java b/src/jake2/game/monsters/M_Berserk.java
index 0b5c513..2158a51 100644
--- a/src/jake2/game/M_Berserk.java
+++ b/src/jake2/game/monsters/M_Berserk.java
@@ -19,10 +19,21 @@
  */
 
 // Created on 11.11.2003 by RST
-// $Id: M_Berserk.java,v 1.3 2004-09-22 19:22:03 salomo Exp $
-package jake2.game;
+// $Id: M_Berserk.java,v 1.2 2005-02-06 18:48:32 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.util.Lib;
 import jake2.util.Math3D;
 
@@ -928,7 +939,7 @@ public class M_Berserk {
      * QUAKED monster_berserk (1 .5 0) (-16 -16 -24) (16 16 32) Ambush
      * Trigger_Spawn Sight
      */
-    static void SP_monster_berserk(edict_t self) {
+    public static void SP_monster_berserk(edict_t self) {
         if (GameBase.deathmatch.value != 0) {
             GameUtil.G_FreeEdict(self);
             return;
diff --git a/src/jake2/game/M_Boss2.java b/src/jake2/game/monsters/M_Boss2.java
index 4290ba8..5730648 100644
--- a/src/jake2/game/M_Boss2.java
+++ b/src/jake2/game/monsters/M_Boss2.java
@@ -19,10 +19,21 @@
  */
 
 // Created on 13.11.2003 by RST.
-// $Id: M_Boss2.java,v 1.3 2004-09-22 19:22:01 salomo Exp $
-package jake2.game;
+// $Id: M_Boss2.java,v 1.2 2005-02-06 18:48:32 salomo Exp $
+package jake2.game.monsters;
 
 import jake2.Defines;
+import jake2.game.EntDieAdapter;
+import jake2.game.EntPainAdapter;
+import jake2.game.EntThinkAdapter;
+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.trace_t;
 import jake2.util.Lib;
 import jake2.util.Math3D;
 
@@ -1016,7 +1027,7 @@ public class M_Boss2 {
      * QUAKED monster_boss2 (1 .5 0) (-56 -56 0) (56 56 80) Ambush Trigger_Spawn
      * Sight
      */
-    static void SP_monster_boss2(edict_t self) {
+    public static void SP_monster_boss2(edict_t self) {
         if (GameBase.deathmatch.value != 0) {
             GameUtil.G_FreeEdict(self);
             return;
diff --git a/src/jake2/game/M_Boss3.java b/src/jake2/game/monsters/M_Boss3.java
index 98d4108..3ae6f65 100644
--- a/src/jake2/game/M_Boss3.java
+++ b/src/jake2/game/monsters/M_Boss3.java
@@ -19,10 +19,15 @@
  */
 
 // Created on 13.11.2003 by RST.
-// $Id: M_Boss3.java,v 1.2 2004-09-22 19:22:05 salomo Exp $
-package jake2.game;
+// $Id: M_Boss3.java,v 1.2 2005-02-06 18:48:17 salomo Exp $
+package jake2.game.monsters;
 
 import jake2.Defines;
+import jake2.game.EntThinkAdapter;
+import jake2.game.EntUseAdapter;
+import jake2.game.GameBase;
+import jake2.game.GameUtil;
+import jake2.game.edict_t;
 import jake2.util.Math3D;
 
 public class M_Boss3 {
@@ -54,7 +59,7 @@ public class M_Boss3 {
      * 
      * Just stands and cycles in one place until targeted, then teleports away.
      */
-    static void SP_monster_boss3_stand(edict_t self) {
+    public static void SP_monster_boss3_stand(edict_t self) {
         if (GameBase.deathmatch.value != 0) {
             GameUtil.G_FreeEdict(self);
             return;
diff --git a/src/jake2/game/M_Boss31.java b/src/jake2/game/monsters/M_Boss31.java
index fec7e31..e267dc2 100644
--- a/src/jake2/game/M_Boss31.java
+++ b/src/jake2/game/monsters/M_Boss31.java
@@ -19,10 +19,21 @@
  */
 
 // Created on 13.11.2003 by RST.
-// $Id: M_Boss31.java,v 1.3 2004-09-22 19:22:07 salomo Exp $
-package jake2.game;
+// $Id: M_Boss31.java,v 1.2 2005-02-06 18:48:16 salomo Exp $
+package jake2.game.monsters;
 
 import jake2.Defines;
+import jake2.game.EntDieAdapter;
+import jake2.game.EntPainAdapter;
+import jake2.game.EntThinkAdapter;
+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.trace_t;
 import jake2.util.Lib;
 import jake2.util.Math3D;
 
@@ -1129,7 +1140,7 @@ public class M_Boss31 {
      * QUAKED monster_jorg (1 .5 0) (-80 -80 0) (90 90 140) Ambush Trigger_Spawn
      * Sight
      */
-    static void SP_monster_jorg(edict_t self) {
+    public static void SP_monster_jorg(edict_t self) {
         if (GameBase.deathmatch.value != 0) {
             GameUtil.G_FreeEdict(self);
             return;
diff --git a/src/jake2/game/M_Boss32.java b/src/jake2/game/monsters/M_Boss32.java
index d46dd50..abbe5ba 100644
--- a/src/jake2/game/M_Boss32.java
+++ b/src/jake2/game/monsters/M_Boss32.java
@@ -19,11 +19,23 @@
  */
 
 // Created on 13.11.2003 by RST.
-// $Id: M_Boss32.java,v 1.3 2004-09-22 19:22:01 salomo Exp $
-package jake2.game;
+// $Id: M_Boss32.java,v 1.2 2005-02-06 18:48:16 salomo Exp $
+package jake2.game.monsters;
 
 import jake2.Defines;
 import jake2.Globals;
+import jake2.game.EntDieAdapter;
+import jake2.game.EntInteractAdapter;
+import jake2.game.EntPainAdapter;
+import jake2.game.EntThinkAdapter;
+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.trace_t;
 import jake2.util.Lib;
 import jake2.util.Math3D;
 
diff --git a/src/jake2/game/M_Brain.java b/src/jake2/game/monsters/M_Brain.java
index 43493b6..1339ed2 100644
--- a/src/jake2/game/M_Brain.java
+++ b/src/jake2/game/monsters/M_Brain.java
@@ -19,10 +19,22 @@
  */
 
 // Created on 13.11.2003 by RST.
-// $Id: M_Brain.java,v 1.3 2004-09-22 19:22:00 salomo Exp $
-package jake2.game;
+// $Id: M_Brain.java,v 1.2 2005-02-06 18:48:14 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.util.Lib;
 import jake2.util.Math3D;
 
@@ -1094,7 +1106,7 @@ public class M_Brain {
      * QUAKED monster_brain (1 .5 0) (-16 -16 -24) (16 16 32) Ambush
      * Trigger_Spawn Sight
      */
-    static void SP_monster_brain(edict_t self) {
+    public static void SP_monster_brain(edict_t self) {
         if (GameBase.deathmatch.value != 0) {
             GameUtil.G_FreeEdict(self);
             return;
diff --git a/src/jake2/game/M_Chick.java b/src/jake2/game/monsters/M_Chick.java
index 5789180..32e3c07 100644
--- a/src/jake2/game/M_Chick.java
+++ b/src/jake2/game/monsters/M_Chick.java
@@ -19,10 +19,23 @@
  */
 
 // Created on 13.11.2003 by RST.
-// $Id: M_Chick.java,v 1.3 2004-09-22 19:22:02 salomo Exp $
-package jake2.game;
+// $Id: M_Chick.java,v 1.2 2005-02-06 18:48:17 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.util.Lib;
 import jake2.util.Math3D;
 
@@ -1248,7 +1261,7 @@ public class M_Chick {
      * QUAKED monster_chick (1 .5 0) (-16 -16 -24) (16 16 32) Ambush
      * Trigger_Spawn Sight
      */
-    static void SP_monster_chick(edict_t self) {
+    public static void SP_monster_chick(edict_t self) {
         if (GameBase.deathmatch.value != 0) {
             GameUtil.G_FreeEdict(self);
             return;
diff --git a/src/jake2/game/M_Flash.java b/src/jake2/game/monsters/M_Flash.java
index 1f70990..e4ccdc5 100644
--- a/src/jake2/game/M_Flash.java
+++ b/src/jake2/game/monsters/M_Flash.java
@@ -19,8 +19,8 @@
  */
 
 // Created on 13.11.2003 by RST.
-// $Id: M_Flash.java,v 1.2 2004-09-22 19:22:01 salomo Exp $
-package jake2.game;
+// $Id: M_Flash.java,v 1.2 2005-02-06 18:48:32 salomo Exp $
+package jake2.game.monsters;
 
 public class M_Flash {
 
diff --git a/src/jake2/game/M_Flipper.java b/src/jake2/game/monsters/M_Flipper.java
index ad0fdce..14acc59 100644
--- a/src/jake2/game/M_Flipper.java
+++ b/src/jake2/game/monsters/M_Flipper.java
@@ -19,10 +19,21 @@
  */
 
 // Created on 13.11.2003 by RST.
-// $Id: M_Flipper.java,v 1.3 2004-09-22 19:22:06 salomo Exp $
-package jake2.game;
+// $Id: M_Flipper.java,v 1.2 2005-02-06 18:48:17 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.util.Lib;
 import jake2.util.Math3D;
 
diff --git a/src/jake2/game/M_Float.java b/src/jake2/game/monsters/M_Float.java
index a7c267f..9c6ce07 100644
--- a/src/jake2/game/M_Float.java
+++ b/src/jake2/game/monsters/M_Float.java
@@ -19,11 +19,23 @@
  */
 
 // Created on 13.11.2003 by RST.
-// $Id: M_Float.java,v 1.3 2004-09-22 19:22:01 salomo Exp $
-package jake2.game;
+// $Id: M_Float.java,v 1.2 2005-02-06 18:48:17 salomo Exp $
+package jake2.game.monsters;
 
 import jake2.Defines;
 import jake2.Globals;
+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.Monster;
+import jake2.game.edict_t;
+import jake2.game.mframe_t;
+import jake2.game.mmove_t;
 import jake2.util.Lib;
 import jake2.util.Math3D;
 
@@ -1157,7 +1169,7 @@ public class M_Float {
      * QUAKED monster_floater (1 .5 0) (-16 -16 -24) (16 16 32) Ambush
      * Trigger_Spawn Sight
      */
-    static void SP_monster_floater(edict_t self) {
+    public static void SP_monster_floater(edict_t self) {
         if (GameBase.deathmatch.value != 0) {
             GameUtil.G_FreeEdict(self);
             return;
diff --git a/src/jake2/game/M_Flyer.java b/src/jake2/game/monsters/M_Flyer.java
index 3a6b3e6..24e1c78 100644
--- a/src/jake2/game/M_Flyer.java
+++ b/src/jake2/game/monsters/M_Flyer.java
@@ -19,10 +19,22 @@
  */
 
 // Created on 13.11.2003 by RST.
-// $Id: M_Flyer.java,v 1.4 2004-09-22 19:22:01 salomo Exp $
-package jake2.game;
+// $Id: M_Flyer.java,v 1.2 2005-02-06 18:48:17 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.Monster;
+import jake2.game.edict_t;
+import jake2.game.mframe_t;
+import jake2.game.mmove_t;
 import jake2.util.Lib;
 import jake2.util.Math3D;
 
diff --git a/src/jake2/game/M_Gladiator.java b/src/jake2/game/monsters/M_Gladiator.java
index c579e40..a2022ad 100644
--- a/src/jake2/game/M_Gladiator.java
+++ b/src/jake2/game/monsters/M_Gladiator.java
@@ -19,10 +19,22 @@
  */
 
 // Created on 13.11.2003 by RST.
-// $Id: M_Gladiator.java,v 1.3 2004-09-22 19:22:06 salomo Exp $
-package jake2.game;
+// $Id: M_Gladiator.java,v 1.2 2005-02-06 18:48:18 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.Monster;
+import jake2.game.edict_t;
+import jake2.game.mframe_t;
+import jake2.game.mmove_t;
 import jake2.util.Lib;
 import jake2.util.Math3D;
 
@@ -588,7 +600,7 @@ public class M_Gladiator {
      * QUAKED monster_gladiator (1 .5 0) (-32 -32 -24) (32 32 64) Ambush
      * Trigger_Spawn Sight
      */
-    static void SP_monster_gladiator(edict_t self) {
+    public static void SP_monster_gladiator(edict_t self) {
         if (GameBase.deathmatch.value != 0) {
             GameUtil.G_FreeEdict(self);
             return;
diff --git a/src/jake2/game/M_Gunner.java b/src/jake2/game/monsters/M_Gunner.java
index 15a3421..4d80bd8 100644
--- a/src/jake2/game/M_Gunner.java
+++ b/src/jake2/game/monsters/M_Gunner.java
@@ -19,10 +19,22 @@
  */
 
 // Created on 13.11.2003 by RST.
-// $Id: M_Gunner.java,v 1.3 2004-09-22 19:22:01 salomo Exp $
-package jake2.game;
+// $Id: M_Gunner.java,v 1.2 2005-02-06 18:48:15 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.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.util.Lib;
 import jake2.util.Math3D;
 
@@ -1033,7 +1045,7 @@ public class M_Gunner {
      * QUAKED monster_gunner (1 .5 0) (-16 -16 -24) (16 16 32) Ambush
      * Trigger_Spawn Sight
      */
-    static void SP_monster_gunner(edict_t self) {
+    public static void SP_monster_gunner(edict_t self) {
         if (GameBase.deathmatch.value != 0) {
             GameUtil.G_FreeEdict(self);
             return;
diff --git a/src/jake2/game/M_Hover.java b/src/jake2/game/monsters/M_Hover.java
index d8ebe86..f2d3055 100644
--- a/src/jake2/game/M_Hover.java
+++ b/src/jake2/game/monsters/M_Hover.java
@@ -19,10 +19,21 @@
  */
 
 // Created on 13.11.2003 by RST.
-// $Id: M_Hover.java,v 1.3 2004-09-22 19:22:01 salomo Exp $
-package jake2.game;
+// $Id: M_Hover.java,v 1.2 2005-02-06 18:48:17 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.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.util.Lib;
 import jake2.util.Math3D;
 
@@ -1010,7 +1021,7 @@ public class M_Hover {
      * QUAKED monster_hover (1 .5 0) (-16 -16 -24) (16 16 32) Ambush
      * Trigger_Spawn Sight
      */
-    static void SP_monster_hover(edict_t self) {
+    public static void SP_monster_hover(edict_t self) {
         if (GameBase.deathmatch.value != 0) {
             GameUtil.G_FreeEdict(self);
             return;
diff --git a/src/jake2/game/M_Infantry.java b/src/jake2/game/monsters/M_Infantry.java
index baef793..c0493eb 100644
--- a/src/jake2/game/M_Infantry.java
+++ b/src/jake2/game/monsters/M_Infantry.java
@@ -19,11 +19,24 @@
  */
 
 // Created on 13.11.2003 by RST.
-// $Id: M_Infantry.java,v 1.3 2004-09-22 19:22:06 salomo Exp $
-package jake2.game;
+// $Id: M_Infantry.java,v 1.2 2005-02-06 18:48:14 salomo Exp $
+package jake2.game.monsters;
 
 import jake2.Defines;
 import jake2.client.M;
+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.util.Lib;
 import jake2.util.Math3D;
 
@@ -496,7 +509,7 @@ public class M_Infantry {
     static mmove_t infantry_move_stand = new mmove_t(FRAME_stand50,
             FRAME_stand71, infantry_frames_stand, null);
 
-    static EntThinkAdapter infantry_stand = new EntThinkAdapter() {
+    public static EntThinkAdapter infantry_stand = new EntThinkAdapter() {
         public boolean think(edict_t self) {
             self.monsterinfo.currentmove = infantry_move_stand;
             return true;
@@ -817,7 +830,7 @@ public class M_Infantry {
     static mmove_t infantry_move_death3 = new mmove_t(FRAME_death301,
             FRAME_death309, infantry_frames_death3, infantry_dead);
 
-    static EntDieAdapter infantry_die = new EntDieAdapter() {
+    public static EntDieAdapter infantry_die = new EntDieAdapter() {
         public void die(edict_t self, edict_t inflictor, edict_t attacker,
                 int damage, float[] point) {
 
@@ -1014,7 +1027,7 @@ public class M_Infantry {
      * QUAKED monster_infantry (1 .5 0) (-16 -16 -24) (16 16 32) Ambush
      * Trigger_Spawn Sight
      */
-    static void SP_monster_infantry(edict_t self) {
+    public static void SP_monster_infantry(edict_t self) {
         if (GameBase.deathmatch.value != 0) {
             GameUtil.G_FreeEdict(self);
             return;
diff --git a/src/jake2/game/M_Insane.java b/src/jake2/game/monsters/M_Insane.java
index bd92a5d..c227c75 100644
--- a/src/jake2/game/M_Insane.java
+++ b/src/jake2/game/monsters/M_Insane.java
@@ -19,10 +19,19 @@
  */
 
 // Created on 13.11.2003 by RST.
-// $Id: M_Insane.java,v 1.3 2004-09-22 19:22:03 salomo Exp $
-package jake2.game;
+// $Id: M_Insane.java,v 1.2 2005-02-06 18:48:14 salomo Exp $
+package jake2.game.monsters;
 
 import jake2.Defines;
+import jake2.game.EntDieAdapter;
+import jake2.game.EntPainAdapter;
+import jake2.game.EntThinkAdapter;
+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.util.Lib;
 import jake2.util.Math3D;
 
@@ -1213,7 +1222,7 @@ public class M_Insane {
      * QUAKED misc_insane (1 .5 0) (-16 -16 -24) (16 16 32) Ambush Trigger_Spawn
      * CRAWL CRUCIFIED STAND_GROUND ALWAYS_STAND
      */
-    static void SP_misc_insane(edict_t self) {
+    public static void SP_misc_insane(edict_t self) {
         //	 static int skin = 0; //@@
 
         if (GameBase.deathmatch.value != 0) {
diff --git a/src/jake2/game/M_Medic.java b/src/jake2/game/monsters/M_Medic.java
index 4217bd6..ac8eb74 100644
--- a/src/jake2/game/M_Medic.java
+++ b/src/jake2/game/monsters/M_Medic.java
@@ -19,10 +19,25 @@
  */
 
 // Created on 13.11.2003 by RST.
-// $Id: M_Medic.java,v 1.3 2004-09-22 19:22:03 salomo Exp $
-package jake2.game;
+// $Id: M_Medic.java,v 1.2 2005-02-06 18:48:32 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.util.Lib;
 import jake2.util.Math3D;
 
@@ -1230,7 +1245,7 @@ public class M_Medic {
      * QUAKED monster_medic (1 .5 0) (-16 -16 -24) (16 16 32) Ambush
      * Trigger_Spawn Sight
      */
-    static void SP_monster_medic(edict_t self) {
+    public static void SP_monster_medic(edict_t self) {
         if (GameBase.deathmatch.value != 0) {
             GameUtil.G_FreeEdict(self);
             return;
diff --git a/src/jake2/game/M_Mutant.java b/src/jake2/game/monsters/M_Mutant.java
index 91fb813..5fba33b 100644
--- a/src/jake2/game/M_Mutant.java
+++ b/src/jake2/game/monsters/M_Mutant.java
@@ -19,11 +19,25 @@
  */
 
 // Created on 13.11.2003 by RST.
-// $Id: M_Mutant.java,v 1.3 2004-09-22 19:22:01 salomo Exp $
-package jake2.game;
+// $Id: M_Mutant.java,v 1.2 2005-02-06 18:48:17 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.util.Lib;
 import jake2.util.Math3D;
 
@@ -979,7 +993,7 @@ public class M_Mutant {
      * QUAKED monster_mutant (1 .5 0) (-32 -32 -24) (32 32 32) Ambush
      * Trigger_Spawn Sight
      */
-    static EntThinkAdapter SP_monster_mutant = new EntThinkAdapter() {
+    public static EntThinkAdapter SP_monster_mutant = new EntThinkAdapter() {
         public boolean think(edict_t self) {
             if (GameBase.deathmatch.value != 0) {
                 GameUtil.G_FreeEdict(self);
diff --git a/src/jake2/game/M_Parasite.java b/src/jake2/game/monsters/M_Parasite.java
index e3a9887..34859f6 100644
--- a/src/jake2/game/M_Parasite.java
+++ b/src/jake2/game/monsters/M_Parasite.java
@@ -19,11 +19,22 @@
  */
 
 // Created on 13.11.2003 by RST.
-// $Id: M_Parasite.java,v 1.3 2004-09-22 19:22:06 salomo Exp $
-package jake2.game;
+// $Id: M_Parasite.java,v 1.2 2005-02-06 18:48:16 salomo Exp $
+package jake2.game.monsters;
 
 import jake2.Defines;
 import jake2.Globals;
+import jake2.game.EntDieAdapter;
+import jake2.game.EntInteractAdapter;
+import jake2.game.EntPainAdapter;
+import jake2.game.EntThinkAdapter;
+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.trace_t;
 import jake2.util.Lib;
 import jake2.util.Math3D;
 
@@ -770,7 +781,7 @@ public class M_Parasite {
      * Trigger_Spawn Sight
      */
 
-    static EntThinkAdapter SP_monster_parasite = new EntThinkAdapter() {
+    public static EntThinkAdapter SP_monster_parasite = new EntThinkAdapter() {
         public boolean think(edict_t self) {
             if (GameBase.deathmatch.value != 0) {
                 GameUtil.G_FreeEdict(self);
diff --git a/src/jake2/game/M_Player.java b/src/jake2/game/monsters/M_Player.java
index bdbdf3b..b15761e 100644
--- a/src/jake2/game/M_Player.java
+++ b/src/jake2/game/monsters/M_Player.java
@@ -19,8 +19,8 @@
  */
 
 // Created on 11.11.2003 by RST.
-// $Id: M_Player.java,v 1.2 2004-09-22 19:22:03 salomo Exp $
-package jake2.game;
+// $Id: M_Player.java,v 1.2 2005-02-06 18:48:14 salomo Exp $
+package jake2.game.monsters;
 
 public class M_Player {
     //	This file generated by qdata - Do NOT Modify
diff --git a/src/jake2/game/M_Soldier.java b/src/jake2/game/monsters/M_Soldier.java
index 238df0f..a42c9ef 100644
--- a/src/jake2/game/M_Soldier.java
+++ b/src/jake2/game/monsters/M_Soldier.java
@@ -19,10 +19,23 @@
  */
 
 // Created on 13.11.2003 by RST.
-// $Id: M_Soldier.java,v 1.3 2004-09-22 19:22:04 salomo Exp $
-package jake2.game;
+// $Id: M_Soldier.java,v 1.2 2005-02-06 18:48:15 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.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.qcommon.Com;
 import jake2.util.Lib;
 import jake2.util.Math3D;
 
@@ -1430,7 +1443,7 @@ public class M_Soldier {
      * QUAKED monster_soldier_light (1 .5 0) (-16 -16 -24) (16 16 32) Ambush
      * Trigger_Spawn Sight
      */
-    static EntThinkAdapter SP_monster_soldier_light = new EntThinkAdapter() {
+    public static EntThinkAdapter SP_monster_soldier_light = new EntThinkAdapter() {
         public boolean think(edict_t self) {
             if (GameBase.deathmatch.value != 0) {
                 GameUtil.G_FreeEdict(self);
@@ -1457,8 +1470,13 @@ public class M_Soldier {
      * Trigger_Spawn Sight
      */
 
-    static EntThinkAdapter SP_monster_soldier = new EntThinkAdapter() {
+    public static EntThinkAdapter SP_monster_soldier = new EntThinkAdapter() {
         public boolean think(edict_t self) {
+            Com.DPrintf("Spawning a soldier at " + self.s.origin[0] + " " +
+                    self.s.origin[1] + " " +
+                    self.s.origin[2] + " " +
+                    "\n");
+            
             if (GameBase.deathmatch.value != 0) {
                 GameUtil.G_FreeEdict(self);
                 return true;
@@ -1481,7 +1499,7 @@ public class M_Soldier {
      * QUAKED monster_soldier_ss (1 .5 0) (-16 -16 -24) (16 16 32) Ambush
      * Trigger_Spawn Sight
      */
-    static EntThinkAdapter SP_monster_soldier_ss = new EntThinkAdapter() {
+    public static EntThinkAdapter SP_monster_soldier_ss = new EntThinkAdapter() {
         public boolean think(edict_t self) {
             if (GameBase.deathmatch.value != 0) {
                 GameUtil.G_FreeEdict(self);
diff --git a/src/jake2/game/M_Supertank.java b/src/jake2/game/monsters/M_Supertank.java
index 1e26b56..b2f18c3 100644
--- a/src/jake2/game/M_Supertank.java
+++ b/src/jake2/game/monsters/M_Supertank.java
@@ -19,10 +19,20 @@
  */
 
 // Created on 13.11.2003 by RST.
-// $Id: M_Supertank.java,v 1.3 2004-09-22 19:22:04 salomo Exp $
-package jake2.game;
+// $Id: M_Supertank.java,v 1.2 2005-02-06 18:48:32 salomo Exp $
+package jake2.game.monsters;
 
 import jake2.Defines;
+import jake2.game.EntDieAdapter;
+import jake2.game.EntPainAdapter;
+import jake2.game.EntThinkAdapter;
+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.util.Lib;
 import jake2.util.Math3D;
 
@@ -1137,7 +1147,7 @@ public class M_Supertank {
      * QUAKED monster_supertank (1 .5 0) (-64 -64 0) (64 64 72) Ambush
      * Trigger_Spawn Sight
      */
-    static EntThinkAdapter SP_monster_supertank = new EntThinkAdapter() {
+    public static EntThinkAdapter SP_monster_supertank = new EntThinkAdapter() {
         public boolean think(edict_t self) {
             if (GameBase.deathmatch.value != 0) {
                 GameUtil.G_FreeEdict(self);
diff --git a/src/jake2/game/M_Tank.java b/src/jake2/game/monsters/M_Tank.java
index 2dc1788..a2def15 100644
--- a/src/jake2/game/M_Tank.java
+++ b/src/jake2/game/monsters/M_Tank.java
@@ -19,10 +19,21 @@
  */
 
 // Created on 13.11.2003 by RST.
-// $Id: M_Tank.java,v 1.3 2004-09-22 19:22:02 salomo Exp $
-package jake2.game;
+// $Id: M_Tank.java,v 1.2 2005-02-06 18:48:15 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.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.util.Lib;
 import jake2.util.Math3D;
 
@@ -1442,7 +1453,7 @@ public class M_Tank {
      * QUAKED monster_tank_commander (1 .5 0) (-32 -32 -16) (32 32 72) Ambush
      * Trigger_Spawn Sight
      */
-    static EntThinkAdapter SP_monster_tank = new EntThinkAdapter() {
+    public static EntThinkAdapter SP_monster_tank = new EntThinkAdapter() {
         public boolean think(edict_t self) {
             if (GameBase.deathmatch.value != 0) {
                 GameUtil.G_FreeEdict(self);