Menu
▾
▴
[Jake2-commits] jake2/src/jake2/game GameItemList.java,NONE,1.1 ItemUseAdapter.java,1.1.1.1,1.2 GameWeapon.java,1.5,1.6 GameFunc.java,1.7,1.8 GameUtil.java,1.13,1.14 GameTrigger.java,1.5,1.6 GameSave.java,1.9,1.10 ItemDropAdapter.java,1.1.1.1,1.2 GameTarget.java,1.6,1.7 SuperAdapter.java,1.7,1.8 PlayerClient.java,1.10,1.11 PlayerHud.java,1.8,1.9 Cmd.java,1.15,1.16 GameSpawn.java,1.13,1.14 GameMisc.java,1.5,1.6 Monster.java,1.6,1.7 PlayerWeapon.java,1.1,1.2 GameItems.java,1.1,1.2 GameAI.java,1.8,1.9 GameTurret.java,1.5,1.6
Update of /cvsroot/jake2/jake2/src/jake2/game In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25864/src/jake2/game Modified Files: ItemUseAdapter.java GameWeapon.java GameFunc.java GameUtil.java GameTrigger.java GameSave.java ItemDropAdapter.java GameTarget.java SuperAdapter.java PlayerClient.java PlayerHud.java Cmd.java GameSpawn.java GameMisc.java Monster.java PlayerWeapon.java GameItems.java GameAI.java GameTurret.java Added Files: GameItemList.java Log Message: savegames are now independend from different jake2 builds and releases Index: GameTrigger.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/game/GameTrigger.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** GameTrigger.java 16 Nov 2005 22:24:52 -0000 1.5 --- GameTrigger.java 20 Nov 2005 22:18:33 -0000 1.6 *************** *** 244,247 **** --- 244,248 ---- // the wait time has passed, so set back up for another activation public static EntThinkAdapter multi_wait = new EntThinkAdapter() { + public String getID(){ return "multi_wait"; } public boolean think(edict_t ent) { *************** *** 252,255 **** --- 253,257 ---- static EntUseAdapter Use_Multi = new EntUseAdapter() { + public String getID(){ return "Use_Multi"; } public void use(edict_t ent, edict_t other, edict_t activator) { ent.activator = activator; *************** *** 259,262 **** --- 261,265 ---- static EntTouchAdapter Touch_Multi = new EntTouchAdapter() { + public String getID(){ return "Touch_Multi"; } public void touch(edict_t self, edict_t other, cplane_t plane, csurface_t surf) { *************** *** 291,294 **** --- 294,298 ---- */ static EntUseAdapter trigger_enable = new EntUseAdapter() { + public String getID(){ return "trigger_enable"; } public void use(edict_t self, edict_t other, edict_t activator) { self.solid = Defines.SOLID_TRIGGER; *************** *** 303,306 **** --- 307,311 ---- */ public static EntUseAdapter trigger_relay_use = new EntUseAdapter() { + public String getID(){ return "trigger_relay_use"; } public void use(edict_t self, edict_t other, edict_t activator) { GameUtil.G_UseTargets(self, activator); *************** *** 323,326 **** --- 328,332 ---- static EntUseAdapter trigger_key_use = new EntUseAdapter() { + public String getID(){ return "trigger_key_use"; } public void use(edict_t self, edict_t other, edict_t activator) { int index; *************** *** 407,410 **** --- 413,417 ---- */ static EntUseAdapter trigger_counter_use = new EntUseAdapter() { + public String getID(){ return "trigger_counter_use"; } public void use(edict_t self, edict_t other, edict_t activator) { *************** *** 448,451 **** --- 455,459 ---- static EntTouchAdapter trigger_push_touch = new EntTouchAdapter() { + public String getID(){ return "trigger_push_touch"; } public void touch(edict_t self, edict_t other, cplane_t plane, csurface_t surf) { *************** *** 493,496 **** --- 501,505 ---- */ static EntUseAdapter hurt_use = new EntUseAdapter() { + public String getID(){ return "hurt_use"; } public void use(edict_t self, edict_t other, edict_t activator) { *************** *** 507,510 **** --- 516,520 ---- static EntTouchAdapter hurt_touch = new EntTouchAdapter() { + public String getID(){ return "hurt_touch"; } public void touch(edict_t self, edict_t other, cplane_t plane, csurface_t surf) { *************** *** 552,555 **** --- 562,566 ---- static EntTouchAdapter trigger_gravity_touch = new EntTouchAdapter() { + public String getID(){ return "trigger_gravity_touch"; } public void touch(edict_t self, edict_t other, cplane_t plane, *************** *** 575,578 **** --- 586,590 ---- static EntTouchAdapter trigger_monsterjump_touch = new EntTouchAdapter() { + public String getID(){ return "trigger_monsterjump_touch"; } public void touch(edict_t self, edict_t other, cplane_t plane, csurface_t surf) { Index: GameAI.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/game/GameAI.java,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** GameAI.java 16 Nov 2005 22:24:53 -0000 1.8 --- GameAI.java 20 Nov 2005 22:18:33 -0000 1.9 *************** *** 358,361 **** --- 358,362 ---- public static EntThinkAdapter walkmonster_start_go = new EntThinkAdapter() { + public String getID() { return "walkmonster_start_go"; } public boolean think(edict_t self) { *************** *** 382,385 **** --- 383,388 ---- public static EntThinkAdapter walkmonster_start = new EntThinkAdapter() { + public String getID() { return "walkmonster_start";} + public boolean think(edict_t self) { *************** *** 391,394 **** --- 394,398 ---- public static EntThinkAdapter flymonster_start_go = new EntThinkAdapter() { + public String getID() { return "flymonster_start_go";} public boolean think(edict_t self) { if (!M.M_walkmove(self, 0, 0)) *************** *** 409,412 **** --- 413,417 ---- public static EntThinkAdapter flymonster_start = new EntThinkAdapter() { + public String getID() { return "flymonster_start";} public boolean think(edict_t self) { self.flags |= Defines.FL_FLY; *************** *** 418,421 **** --- 423,427 ---- public static EntThinkAdapter swimmonster_start_go = new EntThinkAdapter() { + public String getID() { return "swimmonster_start_go";} public boolean think(edict_t self) { if (0 == self.yaw_speed) *************** *** 432,435 **** --- 438,442 ---- public static EntThinkAdapter swimmonster_start = new EntThinkAdapter() { + public String getID() { return "swimmonster_start";} public boolean think(edict_t self) { self.flags |= Defines.FL_SWIM; *************** *** 444,450 **** * * don't move, but turn towards ideal_yaw Distance is for slight position ! * adjustments needed by the animations ============= */ public static AIAdapter ai_turn = new AIAdapter() { public void ai(edict_t self, float dist) { --- 451,459 ---- * * don't move, but turn towards ideal_yaw Distance is for slight position ! * adjustments needed by the animations ! * ============= */ public static AIAdapter ai_turn = new AIAdapter() { + public String getID() { return "ai_turn";} public void ai(edict_t self, float dist) { *************** *** 468,471 **** --- 477,481 ---- */ public static AIAdapter ai_move = new AIAdapter() { + public String getID() { return "ai_move";} public void ai(edict_t self, float dist) { M.M_walkmove(self, self.s.angles[Defines.YAW], dist); *************** *** 481,484 **** --- 491,495 ---- */ public static AIAdapter ai_walk = new AIAdapter() { + public String getID() { return "ai_walk";} public void ai(edict_t self, float dist) { if (self.index == 312) *************** *** 515,518 **** --- 526,530 ---- public static AIAdapter ai_stand = new AIAdapter() { + public String getID() { return "ai_stand";} public void ai(edict_t self, float dist) { float[] v = { 0, 0, 0 }; *************** *** 570,574 **** */ public static AIAdapter ai_charge = new AIAdapter() { ! public void ai(edict_t self, float dist) { float[] v = { 0, 0, 0 }; --- 582,586 ---- */ public static AIAdapter ai_charge = new AIAdapter() { ! public String getID() { return "ai_charge";} public void ai(edict_t self, float dist) { float[] v = { 0, 0, 0 }; *************** *** 591,594 **** --- 603,607 ---- */ public static AIAdapter ai_run = new AIAdapter() { + public String getID() { return "ai_run";} public void ai(edict_t self, float dist) { float[] v = { 0, 0, 0 }; Index: GameItems.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/game/GameItems.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** GameItems.java 16 Nov 2005 22:24:53 -0000 1.1 --- GameItems.java 20 Nov 2005 22:18:33 -0000 1.2 *************** *** 39,765 **** public class GameItems { - public static gitem_t itemlist[] = { - //leave index 0 alone - new gitem_t(null, null, null, null, null, null, null, 0, null, - null, null, 0, 0, null, 0, 0, null, 0, null), - - // - // ARMOR - // [...1007 lines suppressed...] continue; --- 1033,1037 ---- if (0 == cl.pers.inventory[index]) continue; ! it = GameItemList.itemlist[index]; if (it.use == null) continue; *************** *** 1760,1764 **** if (0 == cl.pers.inventory[index]) continue; ! it = itemlist[index]; if (null == it.use) continue; --- 1064,1068 ---- if (0 == cl.pers.inventory[index]) continue; ! it = GameItemList.itemlist[index]; if (null == it.use) continue; Index: ItemUseAdapter.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/game/ItemUseAdapter.java,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** ItemUseAdapter.java 7 Jul 2004 19:59:07 -0000 1.1.1.1 --- ItemUseAdapter.java 20 Nov 2005 22:18:33 -0000 1.2 *************** *** 24,28 **** package jake2.game; ! class ItemUseAdapter extends SuperAdapter { public void use(edict_t ent, gitem_t item) { } --- 24,28 ---- package jake2.game; ! public abstract class ItemUseAdapter extends SuperAdapter { public void use(edict_t ent, gitem_t item) { } Index: PlayerClient.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/game/PlayerClient.java,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** PlayerClient.java 16 Nov 2005 22:24:52 -0000 1.10 --- PlayerClient.java 20 Nov 2005 22:18:33 -0000 1.11 *************** *** 40,43 **** --- 40,44 ---- */ static EntDieAdapter player_die = new EntDieAdapter() { + public String getID() { return "player_die"; } public void die(edict_t self, edict_t inflictor, edict_t attacker, int damage, float[] point) { *************** *** 76,80 **** for (n = 0; n < GameBase.game.num_items; n++) { if (GameBase.coop.value != 0 ! && (GameItems.itemlist[n].flags & Defines.IT_KEY) != 0) self.client.resp.coop_respawn.inventory[n] = self.client.pers.inventory[n]; self.client.pers.inventory[n] = 0; --- 77,81 ---- for (n = 0; n < GameBase.game.num_items; n++) { if (GameBase.coop.value != 0 ! && (GameItemList.itemlist[n].flags & Defines.IT_KEY) != 0) self.client.resp.coop_respawn.inventory[n] = self.client.pers.inventory[n]; self.client.pers.inventory[n] = 0; *************** *** 137,140 **** --- 138,142 ---- }; static EntThinkAdapter SP_FixCoopSpots = new EntThinkAdapter() { + public String getID() { return "SP_FixCoopSpots"; } public boolean think(edict_t self) { *************** *** 172,175 **** --- 174,178 ---- }; static EntThinkAdapter SP_CreateCoopSpots = new EntThinkAdapter() { + public String getID() { return "SP_CreateCoopSpots"; } public boolean think(edict_t self) { *************** *** 206,213 **** --- 209,218 ---- // player pain is handled at the end of the frame in P_DamageFeedback static EntPainAdapter player_pain = new EntPainAdapter() { + public String getID() { return "player_pain"; } public void pain(edict_t self, edict_t other, float kick, int damage) { } }; static EntDieAdapter body_die = new EntDieAdapter() { + public String getID() { return "body_die"; } public void die(edict_t self, edict_t inflictor, edict_t attacker, int damage, float[] point) { Index: SuperAdapter.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/game/SuperAdapter.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** SuperAdapter.java 8 Feb 2005 17:58:46 -0000 1.7 --- SuperAdapter.java 20 Nov 2005 22:18:33 -0000 1.8 *************** *** 29,36 **** import java.util.Vector; ! public class SuperAdapter { /** Adapter registration. */ private static void register(SuperAdapter sa, String id) { adapters.put(id, sa); } --- 29,43 ---- import java.util.Vector; ! public abstract class SuperAdapter { ! ! /** Constructor, does the adapter registration. */ ! public SuperAdapter() { ! register(this, getID()); ! } /** Adapter registration. */ private static void register(SuperAdapter sa, String id) { + if (id.length()==0) + Math.sin(0.1); adapters.put(id, sa); } *************** *** 46,68 **** if (sa == null) { Com.DPrintf("SuperAdapter.getFromID():adapter not found->" + key + "\n"); - int pos= key.indexOf('$'); - String classname= key; - if (pos != -1) - classname= key.substring(0, pos); - - // load class and instantiate - try { - Com.DPrintf("SuperAdapter.getFromID():loading class->" + classname + "\n"); - Class.forName(classname); - } - catch (Exception e) { - Com.DPrintf("SuperAdapter.getFromID():class not found->" + classname + "\n"); - } - - // try it again... - sa= (SuperAdapter) adapters.get(key); - - if (sa == null) - Com.DPrintf("jake2: could not load adapter:" + key + "\n"); } --- 53,56 ---- *************** *** 70,89 **** } - /** Constructor, does the adapter registration. */ - public SuperAdapter() { - StackTraceElement tr[]= new Throwable().getStackTrace(); - adapterid= tr[2].getClassName(); - if (adapterid.length() == 0) - new Throwable("error in creating an adapter id!").printStackTrace(); - else - register(this, adapterid); - } - /** Returns the Adapter-ID. */ ! public String getID() { ! return adapterid; ! } ! ! /** Adapter id. */ ! private String adapterid; } --- 58,62 ---- } /** Returns the Adapter-ID. */ ! public abstract String getID(); } Index: ItemDropAdapter.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/game/ItemDropAdapter.java,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** ItemDropAdapter.java 7 Jul 2004 19:59:07 -0000 1.1.1.1 --- ItemDropAdapter.java 20 Nov 2005 22:18:33 -0000 1.2 *************** *** 24,29 **** package jake2.game; ! public class ItemDropAdapter extends SuperAdapter { ! void drop(edict_t ent, gitem_t item) { } } --- 24,29 ---- package jake2.game; ! public abstract class ItemDropAdapter extends SuperAdapter { ! public void drop(edict_t ent, gitem_t item) { } } Index: Cmd.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/game/Cmd.java,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** Cmd.java 16 Nov 2005 22:24:52 -0000 1.15 --- Cmd.java 20 Nov 2005 22:18:33 -0000 1.16 *************** *** 504,508 **** if (give_all || 0 == Lib.Q_stricmp(name, "weapons")) { for (i = 1; i < GameBase.game.num_items; i++) { ! it = GameItems.itemlist[i]; if (null == it.pickup) continue; --- 504,508 ---- if (give_all || 0 == Lib.Q_stricmp(name, "weapons")) { for (i = 1; i < GameBase.game.num_items; i++) { ! it = GameItemList.itemlist[i]; if (null == it.pickup) continue; *************** *** 517,521 **** if (give_all || 0 == Lib.Q_stricmp(name, "ammo")) { for (i = 1; i < GameBase.game.num_items; i++) { ! it = GameItems.itemlist[i]; if (null == it.pickup) continue; --- 517,521 ---- if (give_all || 0 == Lib.Q_stricmp(name, "ammo")) { for (i = 1; i < GameBase.game.num_items; i++) { ! it = GameItemList.itemlist[i]; if (null == it.pickup) continue; *************** *** 560,564 **** if (give_all) { for (i = 1; i < GameBase.game.num_items; i++) { ! it = GameItems.itemlist[i]; if (it.pickup != null) continue; --- 560,564 ---- if (give_all) { for (i = 1; i < GameBase.game.num_items; i++) { ! it = GameItemList.itemlist[i]; if (it.pickup != null) continue; *************** *** 799,803 **** } ! it = GameItems.itemlist[ent.client.pers.selected_item]; if (it.use == null) { SV_GAME --- 799,803 ---- } ! it = GameItemList.itemlist[ent.client.pers.selected_item]; if (it.use == null) { SV_GAME *************** *** 835,839 **** continue; ! it = GameItems.itemlist[index]; if (it.use == null) continue; --- 835,839 ---- continue; ! it = GameItemList.itemlist[index]; if (it.use == null) continue; *************** *** 876,880 **** if (0 == cl.pers.inventory[index]) continue; ! it = GameItems.itemlist[index]; if (null == it.use) continue; --- 876,880 ---- if (0 == cl.pers.inventory[index]) continue; ! it = GameItemList.itemlist[index]; if (null == it.use) continue; *************** *** 907,911 **** if (0 == cl.pers.inventory[index]) return; ! it = GameItems.itemlist[index]; if (null == it.use) return; --- 907,911 ---- if (0 == cl.pers.inventory[index]) return; ! it = GameItemList.itemlist[index]; if (null == it.use) return; *************** *** 932,936 **** } ! it = GameItems.itemlist[ent.client.pers.selected_item]; if (it.drop == null) { SV_GAME.PF_cprintf(ent, Defines.PRINT_HIGH, --- 932,936 ---- } ! it = GameItemList.itemlist[ent.client.pers.selected_item]; if (it.drop == null) { SV_GAME.PF_cprintf(ent, Defines.PRINT_HIGH, Index: GameSpawn.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/game/GameSpawn.java,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** GameSpawn.java 16 Nov 2005 22:24:53 -0000 1.13 --- GameSpawn.java 20 Nov 2005 22:18:33 -0000 1.14 *************** *** 34,37 **** --- 34,38 ---- 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); *************** *** 41,44 **** --- 42,46 ---- 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); *************** *** 48,51 **** --- 50,54 ---- 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); *************** *** 55,58 **** --- 58,62 ---- 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); *************** *** 62,65 **** --- 66,70 ---- 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); *************** *** 69,72 **** --- 74,78 ---- 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); *************** *** 76,79 **** --- 82,86 ---- 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); *************** *** 83,86 **** --- 90,94 ---- 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(); *************** *** 90,93 **** --- 98,102 ---- 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); *************** *** 107,110 **** --- 116,120 ---- // {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); *************** *** 114,117 **** --- 124,128 ---- 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); *************** *** 133,136 **** --- 144,148 ---- // 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); *************** *** 149,152 **** --- 161,165 ---- static EntThinkAdapter SP_worldspawn = new EntThinkAdapter() { + public String getID(){ return "SP_worldspawn"; } public boolean think(edict_t ent) { *************** *** 649,652 **** --- 662,666 ---- 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); *************** *** 655,658 **** --- 669,673 ---- }), 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); *************** *** 661,664 **** --- 676,680 ---- }), 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); *************** *** 667,670 **** --- 683,687 ---- }), 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); *************** *** 674,677 **** --- 691,695 ---- 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); *************** *** 680,683 **** --- 698,702 ---- }), 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); *************** *** 686,689 **** --- 705,709 ---- }), 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); *************** *** 692,695 **** --- 712,716 ---- }), 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); *************** *** 698,701 **** --- 719,724 ---- }), 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); *************** *** 704,707 **** --- 727,731 ---- }), 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); *************** *** 710,713 **** --- 734,738 ---- }), 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); *************** *** 716,719 **** --- 741,745 ---- }), 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); *************** *** 723,726 **** --- 749,753 ---- 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); *************** *** 729,732 **** --- 756,760 ---- }), 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); *************** *** 735,738 **** --- 763,767 ---- }), 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); *************** *** 741,744 **** --- 770,774 ---- }), 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); *************** *** 747,750 **** --- 777,781 ---- }), 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); *************** *** 753,756 **** --- 784,788 ---- }), 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); *************** *** 759,762 **** --- 791,795 ---- }), 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); *************** *** 765,768 **** --- 798,802 ---- }), 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); *************** *** 771,774 **** --- 805,809 ---- }), 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); *************** *** 777,780 **** --- 812,816 ---- }), 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); *************** *** 783,786 **** --- 819,823 ---- }), 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); *************** *** 789,792 **** --- 826,830 ---- }), 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); *************** *** 795,798 **** --- 833,837 ---- }), 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); *************** *** 801,804 **** --- 840,844 ---- }), 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); *************** *** 807,810 **** --- 847,851 ---- }), 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); *************** *** 813,816 **** --- 854,858 ---- }), 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); *************** *** 819,822 **** --- 861,865 ---- }), 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); *************** *** 825,828 **** --- 868,872 ---- }), 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); *************** *** 831,834 **** --- 875,879 ---- }), 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); *************** *** 837,840 **** --- 882,886 ---- }), 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); *************** *** 844,847 **** --- 890,894 ---- 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); *************** *** 850,853 **** --- 897,901 ---- }), new spawn_t("light", new EntThinkAdapter() { + public String getID(){ return "SP_light"; } public boolean think(edict_t ent) { GameMisc.SP_light(ent); *************** *** 856,859 **** --- 904,908 ---- }), 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); *************** *** 862,865 **** --- 911,915 ---- }), 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); *************** *** 868,871 **** --- 918,922 ---- }), 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); *************** *** 874,877 **** --- 925,929 ---- }), 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); *************** *** 880,883 **** --- 932,936 ---- }), new spawn_t("info_notnull", new EntThinkAdapter() { + public String getID(){ return "info_notnull"; } public boolean think(edict_t ent) { GameMisc.SP_info_notnull(ent); *************** *** 886,889 **** --- 939,943 ---- }), 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); *************** *** 892,895 **** --- 946,950 ---- }), 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); *************** *** 898,901 **** --- 953,957 ---- }), 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); *************** *** 904,907 **** --- 960,964 ---- }), 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); *************** *** 910,913 **** --- 967,971 ---- }), 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); *************** *** 916,919 **** --- 974,978 ---- }), 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); *************** *** 922,925 **** --- 981,985 ---- }), 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); *************** *** 928,931 **** --- 988,992 ---- }), 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); *************** *** 934,937 **** --- 995,999 ---- }), 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); *************** *** 940,943 **** --- 1002,1006 ---- }), 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); *************** *** 946,949 **** --- 1009,1013 ---- }), 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); *************** *** 952,955 **** --- 1016,1020 ---- }), 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); *************** *** 958,961 **** --- 1023,1027 ---- }), 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); *************** *** 964,967 **** --- 1030,1034 ---- }), 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); *************** *** 970,973 **** --- 1037,1041 ---- }), 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); *************** *** 976,979 **** --- 1044,1048 ---- }), 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); *************** *** 984,987 **** --- 1053,1057 ---- 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); *************** *** 990,993 **** --- 1060,1064 ---- }), 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); *************** *** 996,999 **** --- 1067,1071 ---- }), 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); *************** *** 1002,1005 **** --- 1074,1078 ---- }), 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); *************** *** 1008,1011 **** --- 1081,1085 ---- }), 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); *************** *** 1014,1017 **** --- 1088,1092 ---- }), 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); *************** *** 1020,1023 **** --- 1095,1099 ---- }), 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); *************** *** 1026,1029 **** --- 1102,1106 ---- }), 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); *************** *** 1038,1041 **** --- 1115,1119 ---- 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); *************** *** 1043,1046 **** --- 1121,1125 ---- } }), 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); *************** *** 1048,1051 **** --- 1127,1131 ---- } }), 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); *************** *** 1055,1058 **** --- 1135,1139 ---- 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); *************** *** 1060,1063 **** --- 1141,1145 ---- } }), 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); *************** *** 1065,1068 **** --- 1147,1151 ---- } }), 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); *************** *** 1070,1073 **** --- 1153,1157 ---- } }), 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); *************** *** 1077,1080 **** --- 1161,1165 ---- 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); *************** *** 1082,1085 **** --- 1167,1171 ---- } }), 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); *************** *** 1087,1090 **** --- 1173,1177 ---- } }), 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); *************** *** 1092,1095 **** --- 1179,1183 ---- } }), 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); *************** *** 1097,1100 **** --- 1185,1189 ---- } }), 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); *************** *** 1102,1105 **** --- 1191,1195 ---- } }), 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); *************** *** 1107,1110 **** --- 1197,1201 ---- } }), 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); *************** *** 1131,1135 **** for (i = 1; i < GameBase.game.num_items; i++) { ! item = GameItems.itemlist[i]; if (item == null) --- 1222,1226 ---- for (i = 1; i < GameBase.game.num_items; i++) { ! item = GameItemList.itemlist[i]; if (item == null) --- NEW FILE: GameItemList.java --- /* Copyright (C) 1997-2001 Id Software, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ // Created on 20.11.2005 by RST. // $Id: GameItemList.java,v 1.1 2005/11/20 22:18:34 salomo Exp $ package jake2.game; import jake2.Defines; public class GameItemList { // RST: this was separated in the java conversion from the g_item.c // because all adapters have to be created in the other // classes before this class can be loaded. public static gitem_t itemlist[] = { //leave index 0 alone new gitem_t(null, null, null, null, null, null, null, 0, null, null, null, 0, 0, null, 0, 0, null, 0, null), // // ARMOR // new gitem_t( /* * QUAKED item_armor_body (.3 .3 1) (-16 -16 -16) (16 16 16) */ "item_armor_body", GameItems.Pickup_Armor, null, null, null, "misc/ar1_pkup.wav", "models/items/armor/body/tris.md2", Defines.EF_ROTATE, null, /* icon */ "i_bodyarmor", /* pickup */ "Body Armor", /* width */ 3, 0, null, Defines.IT_ARMOR, 0, GameItems.bodyarmor_info, Defines.ARMOR_BODY, /* precache */ ""), /* * QUAKED item_armor_combat (.3 .3 1) (-16 -16 -16) (16 16 16) */ new gitem_t("item_armor_combat", GameItems.Pickup_Armor, null, null, null, "misc/ar1_pkup.wav", "models/items/armor/combat/tris.md2", Defines.EF_ROTATE, null, /* icon */ "i_combatarmor", /* pickup */ "Combat Armor", /* width */ 3, 0, null, Defines.IT_ARMOR, 0, GameItems.combatarmor_info, Defines.ARMOR_COMBAT, /* precache */ ""), /* * QUAKED item_armor_jacket (.3 .3 1) (-16 -16 -16) (16 16 16) */ new gitem_t("item_armor_jacket", GameItems.Pickup_Armor, null, null, null, "misc/ar1_pkup.wav", "models/items/armor/jacket/tris.md2", Defines.EF_ROTATE, null, /* icon */ "i_jacketarmor", /* pickup */ "Jacket Armor", /* width */ 3, 0, null, Defines.IT_ARMOR, 0, GameItems.jacketarmor_info, Defines.ARMOR_JACKET, /* precache */ ""), /* * QUAKED item_armor_shard (.3 .3 1) (-16 -16 -16) (16 16 16) */ new gitem_t("item_armor_shard", GameItems.Pickup_Armor, null, null, null, "misc/ar2_pkup.wav", "models/items/armor/shard/tris.md2", Defines.EF_ROTATE, null, /* icon */ "i_jacketarmor", /* pickup */ "Armor Shard", /* width */ 3, 0, null, Defines.IT_ARMOR, 0, null, Defines.ARMOR_SHARD, /* precache */ ""), /* * QUAKED item_power_screen (.3 .3 1) (-16 -16 -16) (16 16 16) */ new gitem_t("item_power_screen", GameItems.Pickup_PowerArmor, GameItems.Use_PowerArmor, GameItems.Drop_PowerArmor, null, "misc/ar3_pkup.wav", "models/items/armor/screen/tris.md2", Defines.EF_ROTATE, null, /* icon */ "i_powerscreen", /* pickup */ "Power Screen", /* width */ 0, 60, null, Defines.IT_ARMOR, 0, null, 0, /* precache */ ""), /* * QUAKED item_power_shield (.3 .3 1) (-16 -16 -16) (16 16 16) */ new gitem_t("item_power_shield", GameItems.Pickup_PowerArmor, GameItems.Use_PowerArmor, GameItems.Drop_PowerArmor, null, "misc/ar3_pkup.wav", "models/items/armor/shield/tris.md2", Defines.EF_ROTATE, null, /* icon */ "i_powershield", /* pickup */ "Power Shield", /* width */ 0, 60, null, Defines.IT_ARMOR, 0, null, 0, /* precache */ "misc/power2.wav misc/power1.wav"), // // WEAPONS // /* * weapon_blaster (.3 .3 1) (-16 -16 -16) (16 16 16) always owned, * never in the world */ new gitem_t("weapon_blaster", null, PlayerWeapon.Use_Weapon, null, PlayerWeapon.Weapon_Blaster, "misc/w_pkup.wav", null, 0, "models/weapons/v_blast/tris.md2", /* icon */ "w_blaster", /* pickup */ "Blaster", 0, 0, null, Defines.IT_WEAPON | Defines.IT_STAY_COOP, Defines.WEAP_BLASTER, null, 0, /* precache */ "weapons/blastf1a.wav misc/lasfly.wav"), /* * QUAKED weapon_shotgun (.3 .3 1) (-16 -16 -16) (16 16 16) */ new gitem_t("weapon_shotgun", PlayerWeapon.Pickup_Weapon, PlayerWeapon.Use_Weapon, PlayerWeapon.Drop_Weapon, PlayerWeapon.Weapon_Shotgun, "misc/w_pkup.wav", "models/weapons/g_shotg/tris.md2", Defines.EF_ROTATE, "models/weapons/v_shotg/tris.md2", /* icon */ "w_shotgun", /* pickup */ "Shotgun", 0, 1, "Shells", Defines.IT_WEAPON | Defines.IT_STAY_COOP, Defines.WEAP_SHOTGUN, null, 0, /* precache */ "weapons/shotgf1b.wav weapons/shotgr1b.wav"), /* * QUAKED weapon_supershotgun (.3 .3 1) (-16 -16 -16) (16 16 16) */ new gitem_t("weapon_supershotgun", PlayerWeapon.Pickup_Weapon, PlayerWeapon.Use_Weapon, PlayerWeapon.Drop_Weapon, PlayerWeapon.Weapon_SuperShotgun, "misc/w_pkup.wav", "models/weapons/g_shotg2/tris.md2", Defines.EF_ROTATE, "models/weapons/v_shotg2/tris.md2", /* icon */ "w_sshotgun", /* pickup */ "Super Shotgun", 0, 2, "Shells", Defines.IT_WEAPON | Defines.IT_STAY_COOP, Defines.WEAP_SUPERSHOTGUN, null, 0, /* precache */ "weapons/sshotf1b.wav"), /* * QUAKED weapon_machinegun (.3 .3 1) (-16 -16 -16) (16 16 16) */ new gitem_t( "weapon_machinegun", PlayerWeapon.Pickup_Weapon, PlayerWeapon.Use_Weapon, PlayerWeapon.Drop_Weapon, PlayerWeapon.Weapon_Machinegun, "misc/w_pkup.wav", "models/weapons/g_machn/tris.md2", Defines.EF_ROTATE, "models/weapons/v_machn/tris.md2", /* icon */ "w_machinegun", /* pickup */ "Machinegun", 0, 1, "Bullets", Defines.IT_WEAPON | Defines.IT_STAY_COOP, Defines.WEAP_MACHINEGUN, null, 0, /* precache */ "weapons/machgf1b.wav weapons/machgf2b.wav weapons/machgf3b.wav weapons/machgf4b.wav weapons/machgf5b.wav"), /* * QUAKED weapon_chaingun (.3 .3 1) (-16 -16 -16) (16 16 16) */ new gitem_t( "weapon_chaingun", PlayerWeapon.Pickup_Weapon, PlayerWeapon.Use_Weapon, PlayerWeapon.Drop_Weapon, PlayerWeapon.Weapon_Chaingun, "misc/w_pkup.wav", "models/weapons/g_chain/tris.md2", Defines.EF_ROTATE, "models/weapons/v_chain/tris.md2", /* icon */ "w_chaingun", /* pickup */ "Chaingun", 0, 1, "Bullets", Defines.IT_WEAPON | Defines.IT_STAY_COOP, Defines.WEAP_CHAINGUN, null, 0, /* precache */ "weapons/chngnu1a.wav weapons/chngnl1a.wav weapons/machgf3b.wav` weapons/chngnd1a.wav"), /* * QUAKED ammo_grenades (.3 .3 1) (-16 -16 -16) (16 16 16) */ new gitem_t( "ammo_grenades", GameItems.Pickup_Ammo, PlayerWeapon.Use_Weapon, GameItems.Drop_Ammo, PlayerWeapon.Weapon_Grenade, "misc/am_pkup.wav", "models/items/ammo/grenades/medium/tris.md2", 0, "models/weapons/v_handgr/tris.md2", /* icon */ "a_grenades", /* pickup */ "Grenades", /* width */ 3, 5, "grenades", Defines.IT_AMMO | Defines.IT_WEAPON, Defines.WEAP_GRENADES, null, Defines.AMMO_GRENADES, /* precache */ "weapons/hgrent1a.wav weapons/hgrena1b.wav weapons/hgrenc1b.wav weapons/hgrenb1a.wav weapons/hgrenb2a.wav "), /* * QUAKED weapon_grenadelauncher (.3 .3 1) (-16 -16 -16) (16 16 16) */ new gitem_t( "weapon_grenadelauncher", PlayerWeapon.Pickup_Weapon, PlayerWeapon.Use_Weapon, PlayerWeapon.Drop_Weapon, PlayerWeapon.Weapon_GrenadeLauncher, "misc/w_pkup.wav", "models/weapons/g_launch/tris.md2", Defines.EF_ROTATE, "models/weapons/v_launch/tris.md2", /* icon */ "w_glauncher", /* pickup */ "Grenade Launcher", 0, 1, "Grenades", Defines.IT_WEAPON | Defines.IT_STAY_COOP, Defines.WEAP_GRENADELAUNCHER, null, 0, /* precache */ "models/objects/grenade/tris.md2 weapons/grenlf1a.wav weapons/grenlr1b.wav weapons/grenlb1b.wav"), /* * QUAKED weapon_rocketlauncher (.3 .3 1) (-16 -16 -16) (16 16 16) */ new gitem_t( "weapon_rocketlauncher", PlayerWeapon.Pickup_Weapon, PlayerWeapon.Use_Weapon, PlayerWeapon.Drop_Weapon, PlayerWeapon.Weapon_RocketLauncher, "misc/w_pkup.wav", "models/weapons/g_rocket/tris.md2", Defines.EF_ROTATE, "models/weapons/v_rocket/tris.md2", /* icon */ "w_rlauncher", /* pickup */ "Rocket Launcher", 0, 1, "Rockets", Defines.IT_WEAPON | Defines.IT_STAY_COOP, Defines.WEAP_ROCKETLAUNCHER, null, 0, /* precache */ "models/objects/rocket/tris.md2 weapons/rockfly.wav weapons/rocklf1a.wav weapons/rocklr1b.wav models/objects/debris2/tris.md2"), /* * QUAKED weapon_hyperblaster (.3 .3 1) (-16 -16 -16) (16 16 16) */ new gitem_t( "weapon_hyperblaster", PlayerWeapon.Pickup_Weapon, PlayerWeapon.Use_Weapon, PlayerWeapon.Drop_Weapon, PlayerWeapon.Weapon_HyperBlaster, "misc/w_pkup.wav", "models/weapons/g_hyperb/tris.md2", Defines.EF_ROTATE, "models/weapons/v_hyperb/tris.md2", /* icon */ "w_hyperblaster", /* pickup */ "HyperBlaster", 0, 1, "Cells", Defines.IT_WEAPON | Defines.IT_STAY_COOP, Defines.WEAP_HYPERBLASTER, null, 0, /* precache */ "weapons/hyprbu1a.wav weapons/hyprbl1a.wav weapons/hyprbf1a.wav weapons/hyprbd1a.wav misc/lasfly.wav"), /* * QUAKED weapon_railgun (.3 .3 1) (-16 -16 -16) (16 16 16) */ new gitem_t("weapon_railgun", PlayerWeapon.Pickup_Weapon, PlayerWeapon.Use_Weapon, PlayerWeapon.Drop_Weapon, PlayerWeapon.Weapon_Railgun, "misc/w_pkup.wav", "models/weapons/g_rail/tris.md2", Defines.EF_ROTATE, "models/weapons/v_rail/tris.md2", /* icon */ "w_railgun", /* pickup */ "Railgun", 0, 1, "Slugs", Defines.IT_WEAPON | Defines.IT_STAY_COOP, Defines.WEAP_RAILGUN, null, 0, /* precache */ "weapons/rg_hum.wav"), /* * QUAKED weapon_bfg (.3 .3 1) (-16 -16 -16) (16 16 16) */ new gitem_t( "weapon_bfg", PlayerWeapon.Pickup_Weapon, PlayerWeapon.Use_Weapon, PlayerWeapon.Drop_Weapon, PlayerWeapon.Weapon_BFG, "misc/w_pkup.wav", "models/weapons/g_bfg/tris.md2", Defines.EF_ROTATE, "models/weapons/v_bfg/tris.md2", /* icon */ "w_bfg", /* pickup */ "BFG10K", 0, 50, "Cells", Defines.IT_WEAPON | Defines.IT_STAY_COOP, Defines.WEAP_BFG, null, 0, /* precache */ "sprites/s_bfg1.sp2 sprites/s_bfg2.sp2 sprites/s_bfg3.sp2 weapons/bfg__f1y.wav weapons/bfg__l1a.... [truncated message content] |
