Menu
▾
▴
[Jake2-commits] jake2/src/jake2/game GameTargetAdapters.java,1.3,1.4 Fire.java,1.2,1.3 GameAIAdapters.java,1.3,1.4 GameFunc.java,1.3,1.4 client_respawn_t.java,1.5,1.6 M_SoldierAdapters.java,1.1,1.2 GameUtilAdapters.java,1.3,1.4 GameSave.java,1.5,1.6 Info.java,1.2,1.3 game_locals_t.java,1.5,1.6 GameBase.java,1.6,1.7 GameSpawn.java,1.7,1.8 GameMisc.java,1.2,1.3 GamePWeapon.java,1.2,1.3 GameAI.java,1.3,1.4 client_persistant_t.java,1.5,1.6 gclient_t.java,1.3,1.4 BigEndianHandler.java,1.2,NONE field_t.java,1.2,NONE LittleEndianHandler.java,1.1.1.1,NONE
Update of /cvsroot/jake2/jake2/src/jake2/game In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11120/src/jake2/game Modified Files: GameTargetAdapters.java Fire.java GameAIAdapters.java GameFunc.java client_respawn_t.java M_SoldierAdapters.java GameUtilAdapters.java GameSave.java Info.java game_locals_t.java GameBase.java GameSpawn.java GameMisc.java GamePWeapon.java GameAI.java client_persistant_t.java gclient_t.java Removed Files: BigEndianHandler.java field_t.java LittleEndianHandler.java Log Message: did some cource cleanups Index: GameTargetAdapters.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/game/GameTargetAdapters.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** GameTargetAdapters.java 29 Aug 2004 21:39:24 -0000 1.3 --- GameTargetAdapters.java 10 Sep 2004 19:02:53 -0000 1.4 *************** *** 88,95 **** if ((ent.spawnflags & 1) != 0) - //strncpy(game.helpmessage1, ent.message, sizeof(game.helpmessage2) - 1); GameBase.game.helpmessage1 = ent.message; else - //strncpy(game.helpmessage2, ent.message, sizeof(game.helpmessage1) - 1); GameBase.game.helpmessage2 = ent.message; --- 88,93 ---- Index: Info.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/game/Info.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Info.java 8 Jul 2004 15:58:44 -0000 1.2 --- Info.java 10 Sep 2004 19:02:54 -0000 1.3 *************** *** 55,59 **** } ! /** DANGEROUS, returns the modified userinfo string, was pointer-pointer manipulation first*/ public static String Info_SetValueForKey1(String s, String key, String value) { --- 55,59 ---- } ! /**TODO RST: DANGEROUS port, returns the modified userinfo string, was pointer-pointer manipulation first*/ public static String Info_SetValueForKey1(String s, String key, String value) { *************** *** 97,101 **** ! /** DANGEROUS, returns now the modified userinfo string.*/ public static String Info_RemoveKey1(String s, String key) { --- 97,101 ---- ! /** TODO RST: DANGEROUS port, returns now the modified userinfo string.*/ public static String Info_RemoveKey1(String s, String key) { Index: GameSave.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/game/GameSave.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** GameSave.java 4 Sep 2004 19:08:30 -0000 1.5 --- GameSave.java 10 Sep 2004 19:02:54 -0000 1.6 *************** *** 29,48 **** public class GameSave extends GameFunc { - public static field_t levelfields[]= - { - new field_t("changemap", F_LSTRING), - new field_t("sight_client", F_EDICT), - new field_t("sight_entity", F_EDICT), - new field_t("sound_entity", F_EDICT), - new field_t("sound2_entity", F_EDICT), - new field_t(null, F_INT)}; - - public static field_t clientfields[]= - { - new field_t("pers.weapon", F_ITEM), - new field_t("pers.lastweapon", F_ITEM), - new field_t("newweapon", F_ITEM), - new field_t(null, F_INT)}; - public static void CreateEdicts() { g_edicts= new edict_t[game.maxentities]; --- 29,32 ---- *************** *** 131,137 **** CreateEdicts(); - // globals.edicts= g_edicts; - // globals.max_edicts= game.maxentities; - // initialize all clients for this game game.maxclients= (int) maxclients.value; --- 115,118 ---- Index: client_persistant_t.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/game/client_persistant_t.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** client_persistant_t.java 20 Aug 2004 21:29:58 -0000 1.5 --- client_persistant_t.java 10 Sep 2004 19:02:55 -0000 1.6 *************** *** 33,66 **** public class client_persistant_t { ! ! public void set(client_persistant_t from) ! { ! userinfo = from.userinfo; ! netname = from.netname; ! hand = from.hand; ! connected = from.connected; ! health = from.health; ! max_health = from.max_health; ! savedFlags = from.savedFlags; ! selected_item = from.selected_item; System.arraycopy(from.inventory, 0, inventory, 0, inventory.length); ! max_bullets = from.max_bullets; ! max_shells = from.max_shells; ! max_rockets = from.max_rockets; ! max_grenades = from.max_grenades; ! max_cells = from.max_cells; ! max_slugs = from.max_slugs; ! weapon = from.weapon; ! lastweapon = from.lastweapon; ! power_cubes = from.power_cubes; ! score = from.score; ! game_helpchanged = from.game_helpchanged; ! helpchanged = from.helpchanged; ! spectator = from.spectator; } // client data that stays across multiple level loads ! String userinfo = ""; ! String netname = ""; int hand; --- 33,66 ---- public class client_persistant_t { ! ! public void set(client_persistant_t from) { ! ! userinfo= from.userinfo; ! netname= from.netname; ! hand= from.hand; ! connected= from.connected; ! health= from.health; ! max_health= from.max_health; ! savedFlags= from.savedFlags; ! selected_item= from.selected_item; System.arraycopy(from.inventory, 0, inventory, 0, inventory.length); ! max_bullets= from.max_bullets; ! max_shells= from.max_shells; ! max_rockets= from.max_rockets; ! max_grenades= from.max_grenades; ! max_cells= from.max_cells; ! max_slugs= from.max_slugs; ! weapon= from.weapon; ! lastweapon= from.lastweapon; ! power_cubes= from.power_cubes; ! score= from.score; ! game_helpchanged= from.game_helpchanged; ! helpchanged= from.helpchanged; ! spectator= from.spectator; } // client data that stays across multiple level loads ! String userinfo= ""; ! String netname= ""; int hand; *************** *** 74,78 **** int selected_item; ! int inventory[] = new int[Defines.MAX_ITEMS]; // ammo capacities --- 74,78 ---- int selected_item; ! int inventory[]= new int[Defines.MAX_ITEMS]; // ammo capacities *************** *** 93,130 **** boolean spectator; // client is a spectator - /** Reads a client_persistant structure from a file. */ public void read(QuakeFile f) throws IOException { ! userinfo = f.readString(); ! netname = f.readString(); ! hand = f.readInt(); ! connected = f.readInt() != 0; ! health = f.readInt(); ! max_health = f.readInt(); ! savedFlags = f.readInt(); ! selected_item = f.readInt(); ! for (int n = 0; n < Defines.MAX_ITEMS; n++) ! inventory[n] = f.readInt(); ! max_bullets = f.readInt(); ! max_shells = f.readInt(); ! max_rockets = f.readInt(); ! max_grenades = f.readInt(); ! max_cells = f.readInt(); ! max_slugs = f.readInt(); ! weapon = f.readItem(); ! lastweapon = f.readItem(); ! power_cubes = f.readInt(); ! score = f.readInt(); ! game_helpchanged = f.readInt(); ! helpchanged = f.readInt(); ! spectator = f.readInt() != 0; } --- 93,129 ---- boolean spectator; // client is a spectator /** Reads a client_persistant structure from a file. */ public void read(QuakeFile f) throws IOException { ! userinfo= f.readString(); ! netname= f.readString(); ! hand= f.readInt(); ! connected= f.readInt() != 0; ! health= f.readInt(); ! max_health= f.readInt(); ! savedFlags= f.readInt(); ! selected_item= f.readInt(); ! for (int n= 0; n < Defines.MAX_ITEMS; n++) ! inventory[n]= f.readInt(); ! max_bullets= f.readInt(); ! max_shells= f.readInt(); ! max_rockets= f.readInt(); ! max_grenades= f.readInt(); ! max_cells= f.readInt(); ! max_slugs= f.readInt(); ! weapon= f.readItem(); ! lastweapon= f.readItem(); ! power_cubes= f.readInt(); ! score= f.readInt(); ! game_helpchanged= f.readInt(); ! helpchanged= f.readInt(); ! spectator= f.readInt() != 0; } *************** *** 137,141 **** f.writeInt(hand); ! f.writeInt(connected ? 1:0); f.writeInt(health); --- 136,140 ---- f.writeInt(hand); ! f.writeInt(connected ? 1 : 0); f.writeInt(health); *************** *** 144,148 **** f.writeInt(selected_item); ! for (int n = 0; n < Defines.MAX_ITEMS; n++) f.writeInt(inventory[n]); --- 143,147 ---- f.writeInt(selected_item); ! for (int n= 0; n < Defines.MAX_ITEMS; n++) f.writeInt(inventory[n]); *************** *** 161,200 **** f.writeInt(game_helpchanged); f.writeInt(helpchanged); ! f.writeInt(spectator?1:0); ! } ! ! ! public void dump() { ! // client persistant_t ! ! System.out.println("userinfo: " + userinfo); ! System.out.println("netname: " + netname); ! ! System.out.println("hand: " + hand); ! ! System.out.println("connected: " + connected); ! System.out.println("health: " + health); ! ! System.out.println("max_health: " + max_health); ! System.out.println("savedFlags: " + savedFlags); ! System.out.println("selected_item: " + selected_item); ! ! for (int n = 0; n < Defines.MAX_ITEMS; n++) ! System.out.println("inventory[" + n + "]: " + inventory[n]); ! ! System.out.println("max_bullets: " + max_bullets); ! System.out.println("max_shells: " + max_shells); ! System.out.println("max_rockets: " + max_rockets); ! System.out.println("max_grenades: " + max_grenades); ! System.out.println("max_cells: " + max_cells); ! System.out.println("max_slugs: " + max_slugs); ! System.out.println("weapon: " + weapon); ! System.out.println("lastweapon: " + lastweapon); ! System.out.println("powercubes: " + power_cubes); ! System.out.println("score: " + score); ! ! System.out.println("gamehelpchanged: " + game_helpchanged); ! System.out.println("helpchanged: " + helpchanged); ! System.out.println("spectator: " + spectator); } } \ No newline at end of file --- 160,164 ---- f.writeInt(game_helpchanged); f.writeInt(helpchanged); ! f.writeInt(spectator ? 1 : 0); } } \ No newline at end of file Index: M_SoldierAdapters.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/game/M_SoldierAdapters.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** M_SoldierAdapters.java 8 Jul 2004 15:58:44 -0000 1.1 --- M_SoldierAdapters.java 10 Sep 2004 19:02:54 -0000 1.2 *************** *** 628,633 **** }; ! /*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() { --- 628,634 ---- }; ! /** ! * 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() { Index: GameMisc.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/game/GameMisc.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** GameMisc.java 8 Jul 2004 15:58:44 -0000 1.2 --- GameMisc.java 10 Sep 2004 19:02:54 -0000 1.3 *************** *** 133,137 **** if (0 == (self.spawnflags & 1)) { ! // gi.dprintf("func_wall missing TRIGGER_SPAWN\n"); self.spawnflags |= 1; } --- 133,137 ---- if (0 == (self.spawnflags & 1)) { ! gi.dprintf("func_wall missing TRIGGER_SPAWN\n"); self.spawnflags |= 1; } *************** *** 687,691 **** func_clock_reset(self); - //self.message = gi.TagMalloc(CLOCK_MESSAGE_SIZE, TAG_LEVEL); self.message = new String(); --- 687,690 ---- Index: GameSpawn.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/game/GameSpawn.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** GameSpawn.java 4 Sep 2004 19:08:30 -0000 1.7 --- GameSpawn.java 10 Sep 2004 19:02:54 -0000 1.8 *************** *** 28,124 **** public class GameSpawn extends GameSave { ! ! // static EntThinkAdapter SP_func_killbox = new EntThinkAdapter() {public boolean think(edict_t ent){ return true;}}; ! // ! // static EntThinkAdapter SP_trigger_always = new EntThinkAdapter() {public boolean think(edict_t ent){ return true;}}; ! // static EntThinkAdapter SP_trigger_once = new EntThinkAdapter() {public boolean think(edict_t ent){ return true;}}; ! // static EntThinkAdapter SP_trigger_multiple = new EntThinkAdapter() {public boolean think(edict_t ent){ return true;}}; ! // static EntThinkAdapter SP_trigger_relay = new EntThinkAdapter() {public boolean think(edict_t ent){ return true;}}; ! // static EntThinkAdapter SP_trigger_push = new EntThinkAdapter() {public boolean think(edict_t ent){ return true;}}; ! // static EntThinkAdapter SP_trigger_hurt = new EntThinkAdapter() {public boolean think(edict_t ent){ return true;}}; ! // static EntThinkAdapter SP_trigger_key = new EntThinkAdapter() {public boolean think(edict_t ent){ return true;}}; ! // static EntThinkAdapter SP_trigger_counter = new EntThinkAdapter() {public boolean think(edict_t ent){ return true;}}; ! // static EntThinkAdapter SP_trigger_elevator = new EntThinkAdapter() {public boolean think(edict_t ent){ return true;}}; ! // static EntThinkAdapter SP_trigger_gravity = new EntThinkAdapter() {public boolean think(edict_t ent){ return true;}}; ! // static EntThinkAdapter SP_trigger_monsterjump = new EntThinkAdapter() {public boolean think(edict_t ent){ return true;}}; ! // ! // static EntThinkAdapter SP_target_temp_entity = new EntThinkAdapter() {public boolean think(edict_t ent){ return true;}}; ! // static EntThinkAdapter SP_target_speaker = new EntThinkAdapter() {public boolean think(edict_t ent){ return true;}}; ! // static EntThinkAdapter SP_target_explosion = new EntThinkAdapter() {public boolean think(edict_t ent){ return true;}}; ! // static EntThinkAdapter SP_target_changelevel = new EntThinkAdapter() {public boolean think(edict_t ent){ return true;}}; ! // static EntThinkAdapter SP_target_secret = new EntThinkAdapter() {public boolean think(edict_t ent){ return true;}}; ! // static EntThinkAdapter SP_target_goal = new EntThinkAdapter() {public boolean think(edict_t ent){ return true;}}; ! // static EntThinkAdapter SP_target_splash = new EntThinkAdapter() {public boolean think(edict_t ent){ return true;}}; ! // static EntThinkAdapter SP_target_spawner = new EntThinkAdapter() {public boolean think(edict_t ent){ return true;}}; ! // static EntThinkAdapter SP_target_blaster = new EntThinkAdapter() {public boolean think(edict_t ent){ return true;}}; ! // static EntThinkAdapter SP_target_crosslevel_trigger = new EntThinkAdapter() {public boolean think(edict_t ent){ return true;}}; ! // static EntThinkAdapter SP_target_crosslevel_target = new EntThinkAdapter() {public boolean think(edict_t ent){ return true;}}; ! // static EntThinkAdapter SP_target_laser = new EntThinkAdapter() {public boolean think(edict_t ent){ return true;}}; ! // static EntThinkAdapter SP_target_help = new EntThinkAdapter() {public boolean think(edict_t ent){ return true;}}; ! // static EntThinkAdapter SP_target_actor = new EntThinkAdapter() {public boolean think(edict_t ent){ return true;}}; ! // static EntThinkAdapter SP_target_lightramp = new EntThinkAdapter() {public boolean think(edict_t ent){ return true;}}; ! // static EntThinkAdapter SP_target_earthquake = new EntThinkAdapter() {public boolean think(edict_t ent){ return true;}}; ! // static EntThinkAdapter SP_target_character = new EntThinkAdapter() {public boolean think(edict_t ent){ return true;}}; ! // static EntThinkAdapter SP_target_string = new EntThinkAdapter() {public boolean think(edict_t ent){ return true;}}; ! // ! // //static EntThinkAdapter SP_worldspawn = new EntThinkAdapter() {public boolean think(edict_t ent){ return true;}}; ! // static EntThinkAdapter SP_viewthing = new EntThinkAdapter() {public boolean think(edict_t ent){ return true;}}; ! // ! // static EntThinkAdapter SP_light = new EntThinkAdapter() {public boolean think(edict_t ent){ return true;}}; ! // static EntThinkAdapter SP_light_mine1 = new EntThinkAdapter() {public boolean think(edict_t ent){ return true;}}; ! // static EntThinkAdapter SP_light_mine2 = new EntThinkAdapter() {public boolean think(edict_t ent){ return true;}}; ! // static EntThinkAdapter SP_info_null = new EntThinkAdapter() {public boolean think(edict_t ent){ return true;}}; ! // static EntThinkAdapter SP_info_notnull = new EntThinkAdapter() {public boolean think(edict_t ent){ return true;}}; ! // static EntThinkAdapter SP_path_corner = new EntThinkAdapter() {public boolean think(edict_t ent){ return true;}}; ! // static EntThinkAdapter SP_point_combat = new EntThinkAdapter() {public boolean think(edict_t ent){ return true;}}; ! // ! // static EntThinkAdapter SP_misc_explobox = new EntThinkAdapter() {public boolean think(edict_t ent){ return true;}}; ! // static EntThinkAdapter SP_misc_banner = new EntThinkAdapter() {public boolean think(edict_t ent){ return true;}}; ! // static EntThinkAdapter SP_misc_satellite_dish = new EntThinkAdapter() {public boolean think(edict_t ent){ return true;}}; ! // static EntThinkAdapter SP_misc_actor = new EntThinkAdapter() {public boolean think(edict_t ent){ return true;}}; ! // static EntThinkAdapter SP_misc_gib_arm = new EntThinkAdapter() {public boolean think(edict_t ent){ return true;}}; ! // static EntThinkAdapter SP_misc_gib_leg = new EntThinkAdapter() {public boolean think(edict_t ent){ return true;}}; ! // static EntThinkAdapter SP_misc_gib_head = new EntThinkAdapter() {public boolean think(edict_t ent){ return true;}}; ! // static EntThinkAdapter SP_misc_insane = new EntThinkAdapter() {public boolean think(edict_t ent){ return true;}}; ! // static EntThinkAdapter SP_misc_deadsoldier = new EntThinkAdapter() {public boolean think(edict_t ent){ return true;}}; ! // static EntThinkAdapter SP_misc_viper = new EntThinkAdapter() {public boolean think(edict_t ent){ return true;}}; ! // static EntThinkAdapter SP_misc_viper_bomb = new EntThinkAdapter() {public boolean think(edict_t ent){ return true;}}; ! // static EntThinkAdapter SP_misc_bigviper = new EntThinkAdapter() {public boolean think(edict_t ent){ return true;}}; ! // static EntThinkAdapter SP_misc_strogg_ship = new EntThinkAdapter() {public boolean think(edict_t ent){ return true;}}; ! // static EntThinkAdapter SP_misc_teleporter = new EntThinkAdapter() {public boolean think(edict_t ent){ return true;}}; ! // static EntThinkAdapter SP_misc_teleporter_dest = new EntThinkAdapter() {public boolean think(edict_t ent){ return true;}}; ! // static EntThinkAdapter SP_misc_blackhole = new EntThinkAdapter() {public boolean think(edict_t ent){ return true;}}; ! // static EntThinkAdapter SP_misc_eastertank = new EntThinkAdapter() {public boolean think(edict_t ent){ return true;}}; ! // static EntThinkAdapter SP_misc_easterchick = new EntThinkAdapter() {public boolean think(edict_t ent){ return true;}}; ! // static EntThinkAdapter SP_misc_easterchick2 = new EntThinkAdapter() {public boolean think(edict_t ent){ return true;}}; ! // ! // static EntThinkAdapter SP_monster_berserk = new EntThinkAdapter() {public boolean think(edict_t ent){ return true;}}; ! // static EntThinkAdapter SP_monster_gladiator = new EntThinkAdapter() {public boolean think(edict_t ent){ return true;}}; ! // static EntThinkAdapter SP_monster_gunner = new EntThinkAdapter() {public boolean think(edict_t ent){ return true;}}; ! // static EntThinkAdapter SP_monster_infantry = new EntThinkAdapter() {public boolean think(edict_t ent){ return true;}}; ! // static EntThinkAdapter SP_monster_soldier_light = new EntThinkAdapter() {public boolean think(edict_t ent){ return true;}}; ! // static EntThinkAdapter SP_monster_soldier = new EntThinkAdapter() {public boolean think(edict_t ent){ return true;}}; ! // static EntThinkAdapter SP_monster_soldier_ss = new EntThinkAdapter() {public boolean think(edict_t ent){ return true;}}; ! // static EntThinkAdapter SP_monster_tank = new EntThinkAdapter() {public boolean think(edict_t ent){ return true;}}; ! // static EntThinkAdapter SP_monster_medic = new EntThinkAdapter() {public boolean think(edict_t ent){ return true;}}; ! // static EntThinkAdapter SP_monster_flipper = new EntThinkAdapter() {public boolean think(edict_t ent){ return true;}}; ! // static EntThinkAdapter SP_monster_chick = new EntThinkAdapter() {public boolean think(edict_t ent){ return true;}}; ! // static EntThinkAdapter SP_monster_parasite = new EntThinkAdapter() {public boolean think(edict_t ent){ return true;}}; ! // static EntThinkAdapter SP_monster_flyer = new EntThinkAdapter() {public boolean think(edict_t ent){ return true;}}; ! // static EntThinkAdapter SP_monster_brain = new EntThinkAdapter() {public boolean think(edict_t ent){ return true;}}; ! // static EntThinkAdapter SP_monster_floater = new EntThinkAdapter() {public boolean think(edict_t ent){ return true;}}; ! // static EntThinkAdapter SP_monster_hover = new EntThinkAdapter() {public boolean think(edict_t ent){ return true;}}; ! // static EntThinkAdapter SP_monster_mutant = new EntThinkAdapter() {public boolean think(edict_t ent){ return true;}}; ! // static EntThinkAdapter SP_monster_supertank = new EntThinkAdapter() {public boolean think(edict_t ent){ return true;}}; ! // static EntThinkAdapter SP_monster_boss2 = new EntThinkAdapter() {public boolean think(edict_t ent){ return true;}}; ! // static EntThinkAdapter SP_monster_jorg = new EntThinkAdapter() {public boolean think(edict_t ent){ return true;}}; ! // static EntThinkAdapter SP_monster_boss3_stand = new EntThinkAdapter() {public boolean think(edict_t ent){ return true;}}; ! // ! // static EntThinkAdapter SP_monster_commander_body = new EntThinkAdapter() {public boolean think(edict_t ent){ return true;}}; ! // ! // static EntThinkAdapter SP_turret_breach = new EntThinkAdapter() {public boolean think(edict_t ent){ return true;}}; ! // static EntThinkAdapter SP_turret_base = new EntThinkAdapter() {public boolean think(edict_t ent){ return true;}}; ! // static EntThinkAdapter SP_turret_driver = new EntThinkAdapter() {public boolean think(edict_t ent){ return true;}}; ! /* ============= --- 28,32 ---- public class GameSpawn extends GameSave { ! /* ============= *************** *** 156,160 **** */ static void ED_ParseField(String key, String value, edict_t ent) { - field_t f1; byte b; float v; --- 64,67 ---- Index: GamePWeapon.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/game/GamePWeapon.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** GamePWeapon.java 8 Jul 2004 15:58:44 -0000 1.2 --- GamePWeapon.java 10 Sep 2004 19:02:55 -0000 1.3 *************** *** 166,170 **** GameBase.gi.WriteByte(Defines.svc_muzzleflash); - //gi.WriteShort(ent - g_edicts); GameBase.gi.WriteShort(ent.index); GameBase.gi.WriteByte(Defines.MZ_GRENADE | GamePWeapon.is_silenced); --- 166,169 ---- *************** *** 237,241 **** // send muzzle flash GameBase.gi.WriteByte(Defines.svc_muzzleflash); ! //gi.WriteShort(ent - g_edicts); GameBase.gi.WriteShort(ent.index); GameBase.gi.WriteByte(Defines.MZ_ROCKET | GamePWeapon.is_silenced); --- 236,240 ---- // send muzzle flash GameBase.gi.WriteByte(Defines.svc_muzzleflash); ! GameBase.gi.WriteShort(ent.index); GameBase.gi.WriteByte(Defines.MZ_ROCKET | GamePWeapon.is_silenced); *************** *** 456,460 **** // send muzzle flash GameBase.gi.WriteByte(Defines.svc_muzzleflash); ! //gi.WriteShort(ent - g_edicts); GameBase.gi.WriteShort(ent.index); GameBase.gi.WriteByte(Defines.MZ_SHOTGUN | GamePWeapon.is_silenced); --- 455,459 ---- // send muzzle flash GameBase.gi.WriteByte(Defines.svc_muzzleflash); ! GameBase.gi.WriteShort(ent.index); GameBase.gi.WriteByte(Defines.MZ_SHOTGUN | GamePWeapon.is_silenced); *************** *** 532,536 **** // send muzzle flash GameBase.gi.WriteByte(Defines.svc_muzzleflash); ! //gi.WriteShort(ent - g_edicts); GameBase.gi.WriteShort(ent.index); GameBase.gi.WriteByte(Defines.MZ_SSHOTGUN | GamePWeapon.is_silenced); --- 531,535 ---- // send muzzle flash GameBase.gi.WriteByte(Defines.svc_muzzleflash); ! GameBase.gi.WriteShort(ent.index); GameBase.gi.WriteByte(Defines.MZ_SSHOTGUN | GamePWeapon.is_silenced); *************** *** 597,601 **** // send muzzle flash GameBase.gi.WriteByte(Defines.svc_muzzleflash); ! //gi.WriteShort(ent - g_edicts); GameBase.gi.WriteShort(ent.index); GameBase.gi.WriteByte(Defines.MZ_RAILGUN | GamePWeapon.is_silenced); --- 596,600 ---- // send muzzle flash GameBase.gi.WriteByte(Defines.svc_muzzleflash); ! GameBase.gi.WriteShort(ent.index); GameBase.gi.WriteByte(Defines.MZ_RAILGUN | GamePWeapon.is_silenced); *************** *** 646,650 **** // send muzzle flash GameBase.gi.WriteByte(Defines.svc_muzzleflash); ! //gi.WriteShort(ent - g_edicts); GameBase.gi.WriteShort(ent.index); GameBase.gi.WriteByte(Defines.MZ_BFG | GamePWeapon.is_silenced); --- 645,649 ---- // send muzzle flash GameBase.gi.WriteByte(Defines.svc_muzzleflash); ! GameBase.gi.WriteShort(ent.index); GameBase.gi.WriteByte(Defines.MZ_BFG | GamePWeapon.is_silenced); *************** *** 882,886 **** GameBase.gi.WriteByte(Defines.svc_muzzleflash); ! //gi.WriteShort(ent - g_edicts); GameBase.gi.WriteShort(ent.index); GameBase.gi.WriteByte(Defines.MZ_MACHINEGUN | is_silenced); --- 881,885 ---- GameBase.gi.WriteByte(Defines.svc_muzzleflash); ! GameBase.gi.WriteShort(ent.index); GameBase.gi.WriteByte(Defines.MZ_MACHINEGUN | is_silenced); *************** *** 1006,1010 **** // send muzzle flash GameBase.gi.WriteByte(Defines.svc_muzzleflash); ! //gi.WriteShort(ent - g_edicts); GameBase.gi.WriteShort(ent.index); GameBase.gi.WriteByte((Defines.MZ_CHAINGUN1 + shots - 1) | is_silenced); --- 1005,1009 ---- // send muzzle flash GameBase.gi.WriteByte(Defines.svc_muzzleflash); ! GameBase.gi.WriteShort(ent.index); GameBase.gi.WriteByte((Defines.MZ_CHAINGUN1 + shots - 1) | is_silenced); *************** *** 1066,1070 **** else i= 0; - //ent.s.skinnum = (ent - g_edicts - 1) | i; ent.s.skinnum= (ent.index - 1) | i; } --- 1065,1068 ---- *************** *** 1394,1398 **** // send muzzle flash GameBase.gi.WriteByte(Defines.svc_muzzleflash); - //gi.WriteShort(ent - g_edicts); GameBase.gi.WriteShort(ent.index); if (hyper) --- 1392,1395 ---- Index: gclient_t.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/game/gclient_t.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** gclient_t.java 20 Aug 2004 21:29:58 -0000 1.3 --- gclient_t.java 10 Sep 2004 19:02:56 -0000 1.4 *************** *** 395,483 **** f.writeInt(8765); } - - public void dump() - { - - Com.Println("ping: " + ping); - - pers.dump(); - resp.dump(); - - old_pmove.dump(); - - Com.Println("showscores: " + showscores); - Com.Println("showinventury: " + showinventory); - Com.Println("showhelp: " + showhelp); - Com.Println("showhelpicon: " + showhelpicon); - Com.Println("ammoindex: " + ammo_index); - - Com.Println("buttons: " + buttons); - Com.Println("oldbuttons: " + oldbuttons); - Com.Println("latchedbuttons: " + latched_buttons); - - Com.Println("weaponthunk: " + weapon_thunk); - - Com.Println("newweapon: " + newweapon); - - Com.Println("damage_armor: " + damage_armor); - Com.Println("damage_parmor: " + damage_parmor); - Com.Println("damage_blood: " + damage_blood); - Com.Println("damage_knockback: " + damage_knockback); - - Lib.printv("damage_from", damage_from); - - Com.Println("killer_yaw: " + killer_yaw); - - Com.Println("weaponstate: " + weaponstate); - - Lib.printv("kick_angles", kick_angles); - Lib.printv("kick_origin", kick_origin); - - Com.Println("v_dmg_roll: " + v_dmg_roll); - Com.Println("v_dmg_pitch: " + v_dmg_pitch); - Com.Println("v_dmg_time: " + v_dmg_time); - - Com.Println("fall_time: " + fall_time); - Com.Println("fall_value: " + fall_value); - Com.Println("damage_alpha: " + damage_alpha); - Com.Println("bonus_alpha: " + bonus_alpha); - - Lib.printv("damage_blend", damage_blend); - - Lib.printv("v_angle", v_angle); - - Com.Println("bobtime: " + bobtime); - - Lib.printv("oldviewangles", oldviewangles); - Lib.printv("oldvelocity", oldvelocity); - - Com.Println("next_downtime: " + next_drown_time); - - Com.Println("old_waterlevel: " + old_waterlevel); - Com.Println("breathersound: " + breather_sound); - Com.Println("machinegun_shots: " + machinegun_shots); - Com.Println("anim_end: " + anim_end); - Com.Println("anim_priority: " + anim_priority); - Com.Println("anim_duck: " + anim_duck); - Com.Println("anim_run: " + anim_run); - - Com.Println("quad_framenum: " + quad_framenum); - Com.Println("invincible_framenum: " + invincible_framenum); - Com.Println("breather_framenum: " + breather_framenum); - Com.Println("enviro_framenum: " + enviro_framenum); - - Com.Println("grenade_blew_up: " + grenade_blew_up); - Com.Println("grenade_time: " + grenade_time); - Com.Println("silencer_shots: " + silencer_shots); - Com.Println("weapon_sound: " + weapon_sound); - Com.Println("pickup_msg_time: " + pickup_msg_time); - Com.Println("flood_locktill: " + flood_locktill); - - Lib.printv("flood_when", flood_when); - - Com.Println("flood_whenhead: " + flood_whenhead); - Com.Println("respawn_time: " + respawn_time); - Com.Println("chase_target: " + chase_target); - Com.Println("update_chase: " + update_chase); - } } --- 395,397 ---- Index: GameFunc.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/game/GameFunc.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** GameFunc.java 9 Jul 2004 06:50:49 -0000 1.3 --- GameFunc.java 10 Sep 2004 19:02:53 -0000 1.4 *************** *** 375,379 **** if (Lib.Q_stricmp(t.classname, "func_areaportal") == 0) { - //Com.p("Setting portalstate to:" + open); gi.SetAreaPortalState(t.style, open); } --- 375,378 ---- Index: GameUtilAdapters.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/game/GameUtilAdapters.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** GameUtilAdapters.java 8 Sep 2004 20:19:12 -0000 1.3 --- GameUtilAdapters.java 10 Sep 2004 19:02:54 -0000 1.4 *************** *** 67,70 **** --- 67,71 ---- } }; + static EntThinkAdapter DoRespawn = new EntThinkAdapter() { *************** *** 429,451 **** } }; - // ====================================================================== - /* - static ItemUseAdapter Use_Invulnerability = new ItemUseAdapter() - { - public void use(edict_t ent, gitem_t item) - { - - ent.client.pers.inventory[ITEM_INDEX(item)]--; - ValidateSelectedItem(ent); - - if (ent.client.invincible_framenum > level.framenum) - ent.client.invincible_framenum += 300; - else - ent.client.invincible_framenum = level.framenum + 300; - - gi.sound(ent, CHAN_ITEM, gi.soundindex("items/protect.wav"), 1, ATTN_NORM, 0); - } - }; - */ // ====================================================================== --- 430,433 ---- Index: Fire.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/game/Fire.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Fire.java 8 Jul 2004 15:58:43 -0000 1.2 --- Fire.java 10 Sep 2004 19:02:53 -0000 1.3 *************** *** 311,314 **** --- 311,315 ---- fire_lead(self, start, aimdir, damage, kick, Defines.TE_SHOTGUN, hspread, vspread, mod); } + public static void fire_blaster(edict_t self, float[] start, float[] dir, int damage, int speed, int effect, boolean hyper) { Index: GameBase.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/game/GameBase.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** GameBase.java 29 Aug 2004 21:39:24 -0000 1.6 --- GameBase.java 10 Sep 2004 19:02:54 -0000 1.7 *************** *** 689,715 **** } }; - - //globals.apiversion= GAME_API_VERSION; - /* - globals.Init = InitGame; - globals.Shutdown = ShutdownGame; - globals.SpawnEntities = SpawnEntities; - - globals.WriteGame = WriteGame; - globals.ReadGame = ReadGame; - globals.WriteLevel = WriteLevel; - globals.ReadLevel = ReadLevel; - - globals.ClientThink = ClientThink; - globals.ClientConnect = ClientConnect; - globals.ClientUserinfoChanged = ClientUserinfoChanged; - globals.ClientDisconnect = ClientDisconnect; - globals.ClientBegin = ClientBegin; - globals.ClientCommand = ClientCommand; - globals.RunFrame = G_RunFrame; - globals.ServerCommand = ServerCommand; - */ - - //return globals; } } \ No newline at end of file --- 689,692 ---- Index: GameAI.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/game/GameAI.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** GameAI.java 28 Aug 2004 16:40:12 -0000 1.3 --- GameAI.java 10 Sep 2004 19:02:55 -0000 1.4 *************** *** 1669,1673 **** public static void InitItems() { - //game.num_items = sizeof(itemlist)/sizeof(itemlist[0]) - 1; game.num_items = GameAI.itemlist.length - 1; } --- 1669,1672 ---- Index: GameAIAdapters.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/game/GameAIAdapters.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** GameAIAdapters.java 22 Aug 2004 15:46:19 -0000 1.3 --- GameAIAdapters.java 10 Sep 2004 19:02:53 -0000 1.4 *************** *** 167,177 **** public static EntThinkAdapter swimmonster_start= new EntThinkAdapter() { public boolean think(edict_t self) { ! ! { ! self.flags |= Defines.FL_SWIM; ! self.think= swimmonster_start_go; ! Monster.monster_start(self); ! return true; ! } } }; --- 167,174 ---- public static EntThinkAdapter swimmonster_start= new EntThinkAdapter() { public boolean think(edict_t self) { ! self.flags |= Defines.FL_SWIM; ! self.think= swimmonster_start_go; ! Monster.monster_start(self); ! return true; } }; *************** *** 380,384 **** M.M_MoveToGoal(self, dist); self.monsterinfo.search_time= 0; ! // dprint("search timeout\n"); return; } --- 377,381 ---- M.M_MoveToGoal(self, dist); self.monsterinfo.search_time= 0; ! //dprint("search timeout\n"); return; } Index: game_locals_t.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/game/game_locals_t.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** game_locals_t.java 4 Sep 2004 19:08:29 -0000 1.5 --- game_locals_t.java 10 Sep 2004 19:02:54 -0000 1.6 *************** *** 108,127 **** f.writeInt(1928); } - - /** Prints the game locals.*/ - public void dump() - { - Com.Println("String helpmessage1: " + helpmessage1); - Com.Println("String helpmessage2: " + helpmessage2); - - Com.Println("spawnpoit: " + spawnpoint); - Com.Println("maxclients: " + maxclients); - Com.Println("maxentities: " + maxentities); - Com.Println("serverflags: " + serverflags); - Com.Println("numitems: " + num_items); - Com.Println("autosaved: " + autosaved); - - for (int i = 0; i < maxclients; i++) - clients[i].dump(); - } } --- 108,110 ---- --- BigEndianHandler.java DELETED --- Index: client_respawn_t.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/game/client_respawn_t.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** client_respawn_t.java 20 Aug 2004 21:29:57 -0000 1.5 --- client_respawn_t.java 10 Sep 2004 19:02:54 -0000 1.6 *************** *** 95,109 **** f.writeInt(spectator?1:0); } - - - - /** Prints out a client_respawn_t to the quake console.*/ - public void dump() - { - coop_respawn.dump(); - Com.Println("enterframe: " + enterframe); - Com.Println("score: " + score); - Lib.printv("cmd_angles", cmd_angles); - Com.Println("spectator: " + spectator); - } } --- 95,97 ---- --- field_t.java DELETED --- --- LittleEndianHandler.java DELETED --- |
