savegames are now independend from different jake2 builds and releases

1 files changed, 93 insertions, 2 deletions

diff --git a/src/jake2/game/GameSpawn.java b/src/jake2/game/GameSpawn.java
index d88f710..1f24c99 100644
--- a/src/jake2/game/GameSpawn.java
+++ b/src/jake2/game/GameSpawn.java
@@ -20,7 +20,7 @@
 
 // Created on 18.11.2003 by RST.
 
-// $Id: GameSpawn.java,v 1.13 2005-11-16 22:24:53 salomo Exp $
+// $Id: GameSpawn.java,v 1.14 2005-11-20 22:18:33 salomo Exp $
 
 package jake2.game;
 
@@ -33,6 +33,7 @@ import jake2.util.Lib;
 public class GameSpawn {
 
     static EntThinkAdapter SP_item_health = new EntThinkAdapter() {
+        public String getID(){ return "SP_item_health"; }
         public boolean think(edict_t ent) {
             GameItems.SP_item_health(ent);
             return true;
@@ -40,6 +41,7 @@ public class GameSpawn {
     };
 
     static EntThinkAdapter SP_item_health_small = new EntThinkAdapter() {
+        public String getID(){ return "SP_item_health_small"; }
         public boolean think(edict_t ent) {
             GameItems.SP_item_health_small(ent);
             return true;
@@ -47,6 +49,7 @@ public class GameSpawn {
     };
 
     static EntThinkAdapter SP_item_health_large = new EntThinkAdapter() {
+        public String getID(){ return "SP_item_health_large"; }
         public boolean think(edict_t ent) {
             GameItems.SP_item_health_large(ent);
             return true;
@@ -54,6 +57,7 @@ public class GameSpawn {
     };
 
     static EntThinkAdapter SP_item_health_mega = new EntThinkAdapter() {
+        public String getID(){ return "SP_item_health_mega"; }
         public boolean think(edict_t ent) {
             GameItems.SP_item_health_mega(ent);
             return true;
@@ -61,6 +65,7 @@ public class GameSpawn {
     };
 
     static EntThinkAdapter SP_info_player_start = new EntThinkAdapter() {
+        public String getID(){ return "SP_info_player_start"; }
         public boolean think(edict_t ent) {
             PlayerClient.SP_info_player_start(ent);
             return true;
@@ -68,6 +73,7 @@ public class GameSpawn {
     };
 
     static EntThinkAdapter SP_info_player_deathmatch = new EntThinkAdapter() {
+        public String getID(){ return "SP_info_player_deathmatch"; }
         public boolean think(edict_t ent) {
             PlayerClient.SP_info_player_deathmatch(ent);
             return true;
@@ -75,6 +81,7 @@ public class GameSpawn {
     };
 
     static EntThinkAdapter SP_info_player_coop = new EntThinkAdapter() {
+        public String getID(){ return "SP_info_player_coop"; }
         public boolean think(edict_t ent) {
             PlayerClient.SP_info_player_coop(ent);
             return true;
@@ -82,6 +89,7 @@ public class GameSpawn {
     };
 
     static EntThinkAdapter SP_info_player_intermission = new EntThinkAdapter() {
+        public String getID(){ return "SP_info_player_intermission"; }
         public boolean think(edict_t ent) {
             PlayerClient.SP_info_player_intermission();
             return true;
@@ -89,6 +97,7 @@ public class GameSpawn {
     };
 
     static EntThinkAdapter SP_func_plat = new EntThinkAdapter() {
+        public String getID(){ return "SP_func_plat"; }
         public boolean think(edict_t ent) {
             GameFunc.SP_func_plat(ent);
             return true;
@@ -106,6 +115,7 @@ public class GameSpawn {
     //	static EntThinkAdapter SP_func_door_rotating = new EntThinkAdapter()
     // {public boolean think(edict_t ent){ return true;}};
     static EntThinkAdapter SP_func_water = new EntThinkAdapter() {
+        public String getID(){ return "SP_func_water"; }
         public boolean think(edict_t ent) {
             GameFunc.SP_func_water(ent);
             return true;
@@ -113,6 +123,7 @@ public class GameSpawn {
     };
 
     static EntThinkAdapter SP_func_train = new EntThinkAdapter() {
+        public String getID(){ return "SP_func_train"; }
         public boolean think(edict_t ent) {
             GameFunc.SP_func_train(ent);
             return true;
@@ -132,6 +143,7 @@ public class GameSpawn {
     //	static EntThinkAdapter SP_func_areaportal = new EntThinkAdapter() {public
     // boolean think(edict_t ent){ return true;}};
     static EntThinkAdapter SP_func_clock = new EntThinkAdapter() {
+        public String getID(){ return "SP_func_clock"; }
         public boolean think(edict_t ent) {
             GameMisc.SP_func_clock(ent);
             return true;
@@ -148,6 +160,7 @@ public class GameSpawn {
      */
 
     static EntThinkAdapter SP_worldspawn = new EntThinkAdapter() {
+        public String getID(){ return "SP_worldspawn"; }
 
         public boolean think(edict_t ent) {
             ent.movetype = Defines.MOVETYPE_PUSH;
@@ -648,24 +661,28 @@ public class GameSpawn {
             new spawn_t("func_areaportal", GameMisc.SP_func_areaportal),
             new spawn_t("func_clock", SP_func_clock),
             new spawn_t("func_wall", new EntThinkAdapter() {
+        public String getID(){ return "func_wall"; }
                 public boolean think(edict_t ent) {
                     GameMisc.SP_func_wall(ent);
                     return true;
                 }
             }),
             new spawn_t("func_object", new EntThinkAdapter() {
+        public String getID(){ return "SP_func_object"; }
                 public boolean think(edict_t ent) {
                     GameMisc.SP_func_object(ent);
                     return true;
                 }
             }),
             new spawn_t("func_timer", new EntThinkAdapter() {
+        public String getID(){ return "SP_func_timer"; }
                 public boolean think(edict_t ent) {
                     GameFunc.SP_func_timer(ent);
                     return true;
                 }
             }),
             new spawn_t("func_explosive", new EntThinkAdapter() {
+        public String getID(){ return "SP_func_explosive"; }
                 public boolean think(edict_t ent) {
                     GameMisc.SP_func_explosive(ent);
                     return true;
@@ -673,48 +690,57 @@ public class GameSpawn {
             }),
             new spawn_t("func_killbox", GameFunc.SP_func_killbox),
             new spawn_t("trigger_always", new EntThinkAdapter() {
+        public String getID(){ return "SP_trigger_always"; }
                 public boolean think(edict_t ent) {
                     GameTrigger.SP_trigger_always(ent);
                     return true;
                 }
             }),
             new spawn_t("trigger_once", new EntThinkAdapter() {
+        public String getID(){ return "SP_trigger_once"; }
                 public boolean think(edict_t ent) {
                     GameTrigger.SP_trigger_once(ent);
                     return true;
                 }
             }),
             new spawn_t("trigger_multiple", new EntThinkAdapter() {
+        public String getID(){ return "SP_trigger_multiple"; }
                 public boolean think(edict_t ent) {
                     GameTrigger.SP_trigger_multiple(ent);
                     return true;
                 }
             }),
             new spawn_t("trigger_relay", new EntThinkAdapter() {
+        public String getID(){ return "SP_trigger_relay"; }
                 public boolean think(edict_t ent) {
                     GameTrigger.SP_trigger_relay(ent);
                     return true;
                 }
             }),
             new spawn_t("trigger_push", new EntThinkAdapter() {
+        public String getID(){ return "SP_trigger_push"; }
+                
                 public boolean think(edict_t ent) {
                     GameTrigger.SP_trigger_push(ent);
                     return true;
                 }
             }),
             new spawn_t("trigger_hurt", new EntThinkAdapter() {
+        public String getID(){ return "SP_trigger_hurt"; }
                 public boolean think(edict_t ent) {
                     GameTrigger.SP_trigger_hurt(ent);
                     return true;
                 }
             }),
             new spawn_t("trigger_key", new EntThinkAdapter() {
+        public String getID(){ return "SP_trigger_key"; }
                 public boolean think(edict_t ent) {
                     GameTrigger.SP_trigger_key(ent);
                     return true;
                 }
             }),
             new spawn_t("trigger_counter", new EntThinkAdapter() {
+        public String getID(){ return "SP_trigger_counter"; }
                 public boolean think(edict_t ent) {
                     GameTrigger.SP_trigger_counter(ent);
                     return true;
@@ -722,120 +748,140 @@ public class GameSpawn {
             }),
             new spawn_t("trigger_elevator", GameFunc.SP_trigger_elevator),
             new spawn_t("trigger_gravity", new EntThinkAdapter() {
+        public String getID(){ return "SP_trigger_gravity"; }
                 public boolean think(edict_t ent) {
                     GameTrigger.SP_trigger_gravity(ent);
                     return true;
                 }
             }),
             new spawn_t("trigger_monsterjump", new EntThinkAdapter() {
+        public String getID(){ return "SP_trigger_monsterjump"; }
                 public boolean think(edict_t ent) {
                     GameTrigger.SP_trigger_monsterjump(ent);
                     return true;
                 }
             }),
             new spawn_t("target_temp_entity", new EntThinkAdapter() {
+        public String getID(){ return "SP_target_temp_entity"; }
                 public boolean think(edict_t ent) {
                     GameTarget.SP_target_temp_entity(ent);
                     return true;
                 }
             }),
             new spawn_t("target_speaker", new EntThinkAdapter() {
+        public String getID(){ return "SP_target_speaker"; }
                 public boolean think(edict_t ent) {
                     GameTarget.SP_target_speaker(ent);
                     return true;
                 }
             }),
             new spawn_t("target_explosion", new EntThinkAdapter() {
+        public String getID(){ return "SP_target_explosion"; }
                 public boolean think(edict_t ent) {
                     GameTarget.SP_target_explosion(ent);
                     return true;
                 }
             }),
             new spawn_t("target_changelevel", new EntThinkAdapter() {
+        public String getID(){ return "SP_target_changelevel"; }
                 public boolean think(edict_t ent) {
                     GameTarget.SP_target_changelevel(ent);
                     return true;
                 }
             }),
             new spawn_t("target_secret", new EntThinkAdapter() {
+        public String getID(){ return "SP_target_secret"; }
                 public boolean think(edict_t ent) {
                     GameTarget.SP_target_secret(ent);
                     return true;
                 }
             }),
             new spawn_t("target_goal", new EntThinkAdapter() {
+        public String getID(){ return "SP_target_goal"; }
                 public boolean think(edict_t ent) {
                     GameTarget.SP_target_goal(ent);
                     return true;
                 }
             }),
             new spawn_t("target_splash", new EntThinkAdapter() {
+        public String getID(){ return "SP_target_splash"; }
                 public boolean think(edict_t ent) {
                     GameTarget.SP_target_splash(ent);
                     return true;
                 }
             }),
             new spawn_t("target_spawner", new EntThinkAdapter() {
+        public String getID(){ return "SP_target_spawner"; }
                 public boolean think(edict_t ent) {
                     GameTarget.SP_target_spawner(ent);
                     return true;
                 }
             }),
             new spawn_t("target_blaster", new EntThinkAdapter() {
+        public String getID(){ return "SP_target_blaster"; }
                 public boolean think(edict_t ent) {
                     GameTarget.SP_target_blaster(ent);
                     return true;
                 }
             }),
             new spawn_t("target_crosslevel_trigger", new EntThinkAdapter() {
+        public String getID(){ return "SP_target_crosslevel_trigger"; }
                 public boolean think(edict_t ent) {
                     GameTarget.SP_target_crosslevel_trigger(ent);
                     return true;
                 }
             }),
             new spawn_t("target_crosslevel_target", new EntThinkAdapter() {
+        public String getID(){ return "SP_target_crosslevel_target"; }
                 public boolean think(edict_t ent) {
                     GameTarget.SP_target_crosslevel_target(ent);
                     return true;
                 }
             }),
             new spawn_t("target_laser", new EntThinkAdapter() {
+        public String getID(){ return "SP_target_laser"; }
                 public boolean think(edict_t ent) {
                     GameTarget.SP_target_laser(ent);
                     return true;
                 }
             }),
             new spawn_t("target_help", new EntThinkAdapter() {
+        public String getID(){ return "SP_target_help"; }
                 public boolean think(edict_t ent) {
                     GameTarget.SP_target_help(ent);
                     return true;
                 }
             }),
             new spawn_t("target_actor", new EntThinkAdapter() {
+        public String getID(){ return "SP_target_actor"; }
                 public boolean think(edict_t ent) {
                     M_Actor.SP_target_actor(ent);
                     return true;
                 }
             }),
             new spawn_t("target_lightramp", new EntThinkAdapter() {
+        public String getID(){ return "SP_target_lightramp"; }
                 public boolean think(edict_t ent) {
                     GameTarget.SP_target_lightramp(ent);
                     return true;
                 }
             }),
             new spawn_t("target_earthquake", new EntThinkAdapter() {
+        public String getID(){ return "SP_target_earthquake"; }
                 public boolean think(edict_t ent) {
                     GameTarget.SP_target_earthquake(ent);
                     return true;
                 }
             }),
             new spawn_t("target_character", new EntThinkAdapter() {
+        public String getID(){ return "SP_target_character"; }
                 public boolean think(edict_t ent) {
                     GameMisc.SP_target_character(ent);
                     return true;
                 }
             }),
             new spawn_t("target_string", new EntThinkAdapter() {
+        public String getID(){ return "SP_target_string"; }
                 public boolean think(edict_t ent) {
                     GameMisc.SP_target_string(ent);
                     return true;
@@ -843,138 +889,161 @@ public class GameSpawn {
             }),
             new spawn_t("worldspawn", SP_worldspawn),
             new spawn_t("viewthing", new EntThinkAdapter() {
+        public String getID(){ return "SP_viewthing"; }
                 public boolean think(edict_t ent) {
                     GameMisc.SP_viewthing(ent);
                     return true;
                 }
             }),
             new spawn_t("light", new EntThinkAdapter() {
+        public String getID(){ return "SP_light"; }
                 public boolean think(edict_t ent) {
                     GameMisc.SP_light(ent);
                     return true;
                 }
             }),
             new spawn_t("light_mine1", new EntThinkAdapter() {
+        public String getID(){ return "SP_light_mine1"; }
                 public boolean think(edict_t ent) {
                     GameMisc.SP_light_mine1(ent);
                     return true;
                 }
             }),
             new spawn_t("light_mine2", new EntThinkAdapter() {
+        public String getID(){ return "SP_light_mine2"; }
                 public boolean think(edict_t ent) {
                     GameMisc.SP_light_mine2(ent);
                     return true;
                 }
             }),
             new spawn_t("info_null", new EntThinkAdapter() {
+        public String getID(){ return "SP_info_null"; }
                 public boolean think(edict_t ent) {
                     GameMisc.SP_info_null(ent);
                     return true;
                 }
             }),
             new spawn_t("func_group", new EntThinkAdapter() {
+        public String getID(){ return "SP_info_null"; }
                 public boolean think(edict_t ent) {
                     GameMisc.SP_info_null(ent);
                     return true;
                 }
             }),
             new spawn_t("info_notnull", new EntThinkAdapter() {
+        public String getID(){ return "info_notnull"; }
                 public boolean think(edict_t ent) {
                     GameMisc.SP_info_notnull(ent);
                     return true;
                 }
             }),
             new spawn_t("path_corner", new EntThinkAdapter() {
+        public String getID(){ return "SP_path_corner"; }
                 public boolean think(edict_t ent) {
                     GameMisc.SP_path_corner(ent);
                     return true;
                 }
             }),
             new spawn_t("point_combat", new EntThinkAdapter() {
+        public String getID(){ return "SP_point_combat"; }
                 public boolean think(edict_t ent) {
                     GameMisc.SP_point_combat(ent);
                     return true;
                 }
             }),
             new spawn_t("misc_explobox", new EntThinkAdapter() {
+        public String getID(){ return "SP_misc_explobox"; }
                 public boolean think(edict_t ent) {
                     GameMisc.SP_misc_explobox(ent);
                     return true;
                 }
             }),
             new spawn_t("misc_banner", new EntThinkAdapter() {
+        public String getID(){ return "SP_misc_banner"; }
                 public boolean think(edict_t ent) {
                     GameMisc.SP_misc_banner(ent);
                     return true;
                 }
             }),
             new spawn_t("misc_satellite_dish", new EntThinkAdapter() {
+        public String getID(){ return "SP_misc_satellite_dish"; }
                 public boolean think(edict_t ent) {
                     GameMisc.SP_misc_satellite_dish(ent);
                     return true;
                 }
             }),
             new spawn_t("misc_actor", new EntThinkAdapter() {
+        public String getID(){ return "SP_misc_actor"; }
                 public boolean think(edict_t ent) {
                     M_Actor.SP_misc_actor(ent);
                     return false;
                 }
             }),
             new spawn_t("misc_gib_arm", new EntThinkAdapter() {
+        public String getID(){ return "SP_misc_gib_arm"; }
                 public boolean think(edict_t ent) {
                     GameMisc.SP_misc_gib_arm(ent);
                     return true;
                 }
             }),
             new spawn_t("misc_gib_leg", new EntThinkAdapter() {
+        public String getID(){ return "SP_misc_gib_leg"; }
                 public boolean think(edict_t ent) {
                     GameMisc.SP_misc_gib_leg(ent);
                     return true;
                 }
             }),
             new spawn_t("misc_gib_head", new EntThinkAdapter() {
+        public String getID(){ return "SP_misc_gib_head"; }
                 public boolean think(edict_t ent) {
                     GameMisc.SP_misc_gib_head(ent);
                     return true;
                 }
             }),
             new spawn_t("misc_insane", new EntThinkAdapter() {
+        public String getID(){ return "SP_misc_insane"; }
                 public boolean think(edict_t ent) {
                     M_Insane.SP_misc_insane(ent);
                     return true;
                 }
             }),
             new spawn_t("misc_deadsoldier", new EntThinkAdapter() {
+        public String getID(){ return "SP_misc_deadsoldier"; }
                 public boolean think(edict_t ent) {
                     GameMisc.SP_misc_deadsoldier(ent);
                     return true;
                 }
             }),
             new spawn_t("misc_viper", new EntThinkAdapter() {
+        public String getID(){ return "SP_misc_viper"; }
                 public boolean think(edict_t ent) {
                     GameMisc.SP_misc_viper(ent);
                     return true;
                 }
             }),
             new spawn_t("misc_viper_bomb", new EntThinkAdapter() {
+        public String getID(){ return "SP_misc_viper_bomb"; }
                 public boolean think(edict_t ent) {
                     GameMisc.SP_misc_viper_bomb(ent);
                     return true;
                 }
             }),
             new spawn_t("misc_bigviper", new EntThinkAdapter() {
+        public String getID(){ return "SP_misc_bigviper"; }
                 public boolean think(edict_t ent) {
                     GameMisc.SP_misc_bigviper(ent);
                     return true;
                 }
             }),
             new spawn_t("misc_strogg_ship", new EntThinkAdapter() {
+        public String getID(){ return "SP_misc_strogg_ship"; }
                 public boolean think(edict_t ent) {
                     GameMisc.SP_misc_strogg_ship(ent);
                     return true;
                 }
             }),
             new spawn_t("misc_teleporter", new EntThinkAdapter() {
+        public String getID(){ return "SP_misc_teleporter"; }
                 public boolean think(edict_t ent) {
                     GameMisc.SP_misc_teleporter(ent);
                     return true;
@@ -983,48 +1052,56 @@ public class GameSpawn {
             new spawn_t("misc_teleporter_dest",
                     GameMisc.SP_misc_teleporter_dest),
             new spawn_t("misc_blackhole", new EntThinkAdapter() {
+        public String getID(){ return "SP_misc_blackhole"; }
                 public boolean think(edict_t ent) {
                     GameMisc.SP_misc_blackhole(ent);
                     return true;
                 }
             }),
             new spawn_t("misc_eastertank", new EntThinkAdapter() {
+        public String getID(){ return "SP_misc_eastertank"; }
                 public boolean think(edict_t ent) {
                     GameMisc.SP_misc_eastertank(ent);
                     return true;
                 }
             }),
             new spawn_t("misc_easterchick", new EntThinkAdapter() {
+        public String getID(){ return "SP_misc_easterchick"; }
                 public boolean think(edict_t ent) {
                     GameMisc.SP_misc_easterchick(ent);
                     return true;
                 }
             }),
             new spawn_t("misc_easterchick2", new EntThinkAdapter() {
+        public String getID(){ return "SP_misc_easterchick2"; }
                 public boolean think(edict_t ent) {
                     GameMisc.SP_misc_easterchick2(ent);
                     return true;
                 }
             }),
             new spawn_t("monster_berserk", new EntThinkAdapter() {
+        public String getID(){ return "SP_monster_berserk"; }
                 public boolean think(edict_t ent) {
                     M_Berserk.SP_monster_berserk(ent);
                     return true;
                 }
             }),
             new spawn_t("monster_gladiator", new EntThinkAdapter() {
+        public String getID(){ return "SP_monster_gladiator"; }
                 public boolean think(edict_t ent) {
                     M_Gladiator.SP_monster_gladiator(ent);
                     return true;
                 }
             }),
             new spawn_t("monster_gunner", new EntThinkAdapter() {
+        public String getID(){ return "SP_monster_gunner"; }
                 public boolean think(edict_t ent) {
                     M_Gunner.SP_monster_gunner(ent);
                     return true;
                 }
             }),
             new spawn_t("monster_infantry", new EntThinkAdapter() {
+        public String getID(){ return "SP_monster_infantry"; }
                 public boolean think(edict_t ent) {
                     M_Infantry.SP_monster_infantry(ent);
                     return true;
@@ -1037,16 +1114,19 @@ public class GameSpawn {
             new spawn_t("monster_tank", M_Tank.SP_monster_tank),
             new spawn_t("monster_tank_commander", M_Tank.SP_monster_tank),
             new spawn_t("monster_medic", new EntThinkAdapter() {
+        public String getID(){ return "SP_monster_medic"; }
                 public boolean think(edict_t ent) {
                     M_Medic.SP_monster_medic(ent);
                     return true;
                 }
             }), new spawn_t("monster_flipper", new EntThinkAdapter() {
+        public String getID(){ return "SP_monster_flipper"; }
                 public boolean think(edict_t ent) {
                     M_Flipper.SP_monster_flipper(ent);
                     return true;
                 }
             }), new spawn_t("monster_chick", new EntThinkAdapter() {
+        public String getID(){ return "SP_monster_chick"; }
                 public boolean think(edict_t ent) {
                     M_Chick.SP_monster_chick(ent);
                     return true;
@@ -1054,21 +1134,25 @@ public class GameSpawn {
             }),
             new spawn_t("monster_parasite", M_Parasite.SP_monster_parasite),
             new spawn_t("monster_flyer", new EntThinkAdapter() {
+        public String getID(){ return "SP_monster_flyer"; }
                 public boolean think(edict_t ent) {
                     M_Flyer.SP_monster_flyer(ent);
                     return true;
                 }
             }), new spawn_t("monster_brain", new EntThinkAdapter() {
+        public String getID(){ return "SP_monster_brain"; }
                 public boolean think(edict_t ent) {
                     M_Brain.SP_monster_brain(ent);
                     return true;
                 }
             }), new spawn_t("monster_floater", new EntThinkAdapter() {
+        public String getID(){ return "SP_monster_floater"; }
                 public boolean think(edict_t ent) {
                     M_Float.SP_monster_floater(ent);
                     return true;
                 }
             }), new spawn_t("monster_hover", new EntThinkAdapter() {
+        public String getID(){ return "SP_monster_hover"; }
                 public boolean think(edict_t ent) {
                     M_Hover.SP_monster_hover(ent);
                     return true;
@@ -1076,36 +1160,43 @@ public class GameSpawn {
             }), new spawn_t("monster_mutant", M_Mutant.SP_monster_mutant),
             new spawn_t("monster_supertank", M_Supertank.SP_monster_supertank),
             new spawn_t("monster_boss2", new EntThinkAdapter() {
+        public String getID(){ return "SP_monster_boss2"; }
                 public boolean think(edict_t ent) {
                     M_Boss2.SP_monster_boss2(ent);
                     return true;
                 }
             }), new spawn_t("monster_boss3_stand", new EntThinkAdapter() {
+        public String getID(){ return "SP_monster_boss3_stand"; }
                 public boolean think(edict_t ent) {
                     M_Boss3.SP_monster_boss3_stand(ent);
                     return true;
                 }
             }), new spawn_t("monster_jorg", new EntThinkAdapter() {
+        public String getID(){ return "SP_monster_jorg"; }
                 public boolean think(edict_t ent) {
                     M_Boss31.SP_monster_jorg(ent);
                     return true;
                 }
             }), new spawn_t("monster_commander_body", new EntThinkAdapter() {
+        public String getID(){ return "SP_monster_commander_body"; }
                 public boolean think(edict_t ent) {
                     GameMisc.SP_monster_commander_body(ent);
                     return true;
                 }
             }), new spawn_t("turret_breach", new EntThinkAdapter() {
+        public String getID(){ return "SP_turret_breach"; }
                 public boolean think(edict_t ent) {
                     GameTurret.SP_turret_breach(ent);
                     return true;
                 }
             }), new spawn_t("turret_base", new EntThinkAdapter() {
+        public String getID(){ return "SP_turret_base"; }
                 public boolean think(edict_t ent) {
                     GameTurret.SP_turret_base(ent);
                     return true;
                 }
             }), new spawn_t("turret_driver", new EntThinkAdapter() {
+        public String getID(){ return "SP_turret_driver"; }
                 public boolean think(edict_t ent) {
                     GameTurret.SP_turret_driver(ent);
                     return true;
@@ -1130,7 +1221,7 @@ public class GameSpawn {
         } // check item spawn functions
         for (i = 1; i < GameBase.game.num_items; i++) {
 
-            item = GameItems.itemlist[i];
+            item = GameItemList.itemlist[i];
 
             if (item == null)
                 GameBase.gi.error("ED_CallSpawn: null item in pos " + i);