savegames are now independend from different jake2 builds and releases

1 files changed, 25 insertions, 1 deletions

diff --git a/src/jake2/game/PlayerWeapon.java b/src/jake2/game/PlayerWeapon.java
index f994568..1b9cca3 100644
--- a/src/jake2/game/PlayerWeapon.java
+++ b/src/jake2/game/PlayerWeapon.java
@@ -20,7 +20,7 @@
 
 // Created on 16.11.2003 by RST.
 
-// $Id: PlayerWeapon.java,v 1.1 2005-11-16 22:24:53 salomo Exp $
+// $Id: PlayerWeapon.java,v 1.2 2005-11-20 22:18:33 salomo Exp $
 
 package jake2.game;
 
@@ -34,6 +34,7 @@ import jake2.util.Math3D;
 public class PlayerWeapon {
 
     public static EntThinkAdapter Weapon_Grenade = new EntThinkAdapter() {
+    	public String getID() { return "Weapon_Grenade"; }
 
         public boolean think(edict_t ent) {
             if ((ent.client.newweapon != null)
@@ -145,6 +146,7 @@ public class PlayerWeapon {
      */
 
     public static EntThinkAdapter weapon_grenadelauncher_fire = new EntThinkAdapter() {
+    	public String getID() { return "weapon_grenadelauncher_fire"; }
 
         public boolean think(edict_t ent) {
             float[] offset = { 0, 0, 0 };
@@ -184,6 +186,7 @@ public class PlayerWeapon {
     };
 
     public static EntThinkAdapter Weapon_GrenadeLauncher = new EntThinkAdapter() {
+    	public String getID() { return "Weapon_GrenadeLauncher"; }
 
         public boolean think(edict_t ent) {
 
@@ -205,6 +208,7 @@ public class PlayerWeapon {
      */
 
     public static EntThinkAdapter Weapon_RocketLauncher_Fire = new EntThinkAdapter() {
+    	public String getID() { return "Weapon_RocketLauncher_Fire"; }
 
         public boolean think(edict_t ent) {
 
@@ -252,6 +256,7 @@ public class PlayerWeapon {
     };
 
     public static EntThinkAdapter Weapon_RocketLauncher = new EntThinkAdapter() {
+    	public String getID() { return "Weapon_RocketLauncher"; }
 
         public boolean think(edict_t ent) {
 
@@ -265,6 +270,7 @@ public class PlayerWeapon {
     };
 
     public static EntThinkAdapter Weapon_Blaster_Fire = new EntThinkAdapter() {
+    	public String getID() { return "Weapon_Blaster_Fire"; }
 
         public boolean think(edict_t ent) {
 
@@ -282,6 +288,7 @@ public class PlayerWeapon {
     };
 
     public static EntThinkAdapter Weapon_Blaster = new EntThinkAdapter() {
+    	public String getID() { return "Weapon_Blaster"; }
 
         public boolean think(edict_t ent) {
 
@@ -295,6 +302,7 @@ public class PlayerWeapon {
     };
 
     public static EntThinkAdapter Weapon_HyperBlaster_Fire = new EntThinkAdapter() {
+    	public String getID() { return "Weapon_HyperBlaster_Fire"; }
 
         public boolean think(edict_t ent) {
             float rotation;
@@ -365,6 +373,7 @@ public class PlayerWeapon {
     };
 
     public static EntThinkAdapter Weapon_HyperBlaster = new EntThinkAdapter() {
+    	public String getID() { return "Weapon_HyperBlaster"; }
         public boolean think(edict_t ent) {
 
             int pause_frames[] = { 0 };
@@ -377,6 +386,7 @@ public class PlayerWeapon {
     };
 
     public static EntThinkAdapter Weapon_Machinegun = new EntThinkAdapter() {
+    	public String getID() { return "Weapon_Machinegun"; }
         public boolean think(edict_t ent) {
 
             int pause_frames[] = { 23, 45, 0 };
@@ -389,6 +399,7 @@ public class PlayerWeapon {
     };
 
     public static EntThinkAdapter Weapon_Chaingun = new EntThinkAdapter() {
+    	public String getID() { return "Weapon_Chaingun"; }
         public boolean think(edict_t ent) {
 
             int pause_frames[] = { 38, 43, 51, 61, 0 };
@@ -410,6 +421,7 @@ public class PlayerWeapon {
      */
 
     public static EntThinkAdapter weapon_shotgun_fire = new EntThinkAdapter() {
+    	public String getID() { return "weapon_shotgun_fire"; }
 
         public boolean think(edict_t ent) {
 
@@ -464,6 +476,7 @@ public class PlayerWeapon {
     };
 
     public static EntThinkAdapter Weapon_Shotgun = new EntThinkAdapter() {
+    	public String getID() { return "Weapon_Shotgun"; }
         public boolean think(edict_t ent) {
             int pause_frames[] = { 22, 28, 34, 0 };
             int fire_frames[] = { 8, 9, 0 };
@@ -475,6 +488,7 @@ public class PlayerWeapon {
     };
 
     public static EntThinkAdapter weapon_supershotgun_fire = new EntThinkAdapter() {
+    	public String getID() { return "weapon_supershotgun_fire"; }
 
         public boolean think(edict_t ent) {
 
@@ -532,6 +546,7 @@ public class PlayerWeapon {
     };
 
     public static EntThinkAdapter Weapon_SuperShotgun = new EntThinkAdapter() {
+    	public String getID() { return "Weapon_SuperShotgun"; }
         public boolean think(edict_t ent) {
 
             int pause_frames[] = { 29, 42, 57, 0 };
@@ -551,6 +566,7 @@ public class PlayerWeapon {
      * ======================================================================
      */
     public static EntThinkAdapter weapon_railgun_fire = new EntThinkAdapter() {
+    	public String getID() { return "weapon_railgun_fire"; }
 
         public boolean think(edict_t ent) {
 
@@ -602,6 +618,7 @@ public class PlayerWeapon {
     };
 
     public static EntThinkAdapter Weapon_Railgun = new EntThinkAdapter() {
+    	public String getID() { return "Weapon_Railgun"; }
 
         public boolean think(edict_t ent) {
 
@@ -622,6 +639,7 @@ public class PlayerWeapon {
      */
 
     public static EntThinkAdapter weapon_bfg_fire = new EntThinkAdapter() {
+    	public String getID() { return "weapon_bfg_fire"; }
 
         public boolean think(edict_t ent) {
 
@@ -685,6 +703,7 @@ public class PlayerWeapon {
     };
 
     public static EntThinkAdapter Weapon_BFG = new EntThinkAdapter() {
+    	public String getID() { return "Weapon_BFG"; }
         public boolean think(edict_t ent) {
 
             Weapon_Generic(ent, 8, 32, 55, 58, pause_frames, fire_frames,
@@ -706,6 +725,7 @@ public class PlayerWeapon {
      * ================
      */
     public static ItemUseAdapter Use_Weapon = new ItemUseAdapter() {
+    	public String getID() { return "Use_Weapon"; }
 
         public void use(edict_t ent, gitem_t item) {
             int ammo_index;
@@ -748,6 +768,7 @@ public class PlayerWeapon {
      */
 
     public static ItemDropAdapter Drop_Weapon = new ItemDropAdapter() {
+    	public String getID() { return "Drop_Weapon"; }
         public void drop(edict_t ent, gitem_t item) {
             int index;
 
@@ -777,6 +798,7 @@ public class PlayerWeapon {
      */
 
     public static EntThinkAdapter Machinegun_Fire = new EntThinkAdapter() {
+    	public String getID() { return "Machinegun_Fire"; }
 
         public boolean think(edict_t ent) {
 
@@ -868,6 +890,7 @@ public class PlayerWeapon {
     };
 
     public static EntThinkAdapter Chaingun_Fire = new EntThinkAdapter() {
+    	public String getID() { return "Chaingun_Fire"; }
 
         public boolean think(edict_t ent) {
 
@@ -994,6 +1017,7 @@ public class PlayerWeapon {
     public static int fire_frames[] = { 9, 17, 0 };
 
     public static EntInteractAdapter Pickup_Weapon = new EntInteractAdapter() {
+    	public String getID() { return "Pickup_Weapon"; }
         public boolean interact(edict_t ent, edict_t other) {
             int index;
             gitem_t ammo;