Menu
▾
▴
[Jake2-commits] jake2/src/jake2/game Cmd.java,1.8,1.8.2.1 PlayerView.java,1.2,1.2.6.1 GamePWeapon.java,1.6,1.6.6.1 trace_t.java,1.4,1.4.6.1 GameSpawn.java,1.9,1.9.6.1 GameTurret.java,1.3,1.3.6.1 cplane_t.java,1.3,1.3.10.1 GameUtil.java,1.7.6.1,1.7.6.2 Monster.java,1.4,1.4.6.1 EdictIterator.java,1.2,1.2.10.1 GameAI.java,1.5,1.5.6.1 M_Brain.java,1.3,NONE M_Flash.java,1.2,NONE M_Boss32.java,1.3,NONE M_Gunner.java,1.3,NONE M_Mutant.java,1.3,NONE M_Boss2.java,1.3,NONE M_Flyer.java,1.4,NONE M_Float.java,1.3,NONE M_Hover.java,1.3,NONE M_Actor.java,1.4,NONE M_Chick.java,1.3,NONE M_Tank.java,1.3,NONE M_Berserk.java,1.3,NONE M_Medic.java,1.3,NONE M_Player.java,1.2,NONE M_Insane.java,1.3,NONE M_Soldier.java,1.3.6.1,NONE M_Supertank.java,1.3,NONE M_Boss3.java,1.2,NONE M_Parasite.java,1.3,NONE M_Gladiator.java,1.3,NONE M_Flipper.java,1.3,NONE M_Infantry.java,1.3,NONE M_Boss31.java,1.3,NONE
Update of /cvsroot/jake2/jake2/src/jake2/game In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29339/src/jake2/game Modified Files: Tag: RST Cmd.java PlayerView.java GamePWeapon.java trace_t.java GameSpawn.java GameTurret.java cplane_t.java GameUtil.java Monster.java EdictIterator.java GameAI.java Removed Files: Tag: RST M_Brain.java M_Flash.java M_Boss32.java M_Gunner.java M_Mutant.java M_Boss2.java M_Flyer.java M_Float.java M_Hover.java M_Actor.java M_Chick.java M_Tank.java M_Berserk.java M_Medic.java M_Player.java M_Insane.java M_Soldier.java M_Supertank.java M_Boss3.java M_Parasite.java M_Gladiator.java M_Flipper.java M_Infantry.java M_Boss31.java Log Message: This has vec3-optimize and the OAK bot. --- M_Insane.java DELETED --- --- M_Soldier.java DELETED --- --- M_Parasite.java DELETED --- --- M_Player.java DELETED --- Index: EdictIterator.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/game/EdictIterator.java,v retrieving revision 1.2 retrieving revision 1.2.10.1 diff -C2 -d -r1.2 -r1.2.10.1 *** EdictIterator.java 8 Jul 2004 15:58:44 -0000 1.2 --- EdictIterator.java 16 Jan 2005 21:21:03 -0000 1.2.10.1 *************** *** 32,36 **** this.i = i; } ! edict_t o; int i; } \ No newline at end of file --- 32,36 ---- this.i = i; } ! public edict_t o; int i; } \ No newline at end of file --- M_Float.java DELETED --- Index: GameSpawn.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/game/GameSpawn.java,v retrieving revision 1.9 retrieving revision 1.9.6.1 diff -C2 -d -r1.9 -r1.9.6.1 *** GameSpawn.java 22 Sep 2004 19:22:05 -0000 1.9 --- GameSpawn.java 16 Jan 2005 21:21:02 -0000 1.9.6.1 *************** *** 24,27 **** --- 24,28 ---- import jake2.Defines; + import jake2.game.monsters.*; import jake2.qcommon.Com; import jake2.util.Lib; *************** *** 350,354 **** if (key.equals("nextmap")) ! Com.p("nextmap: " + value); if (!GameBase.st.set(key, value)) if (!ent.set(key, value)) --- 351,355 ---- if (key.equals("nextmap")) ! Com.Println("nextmap: " + value); if (!GameBase.st.set(key, value)) if (!ent.set(key, value)) --- M_Actor.java DELETED --- --- M_Tank.java DELETED --- --- M_Supertank.java DELETED --- --- M_Boss32.java DELETED --- Index: Monster.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/game/Monster.java,v retrieving revision 1.4 retrieving revision 1.4.6.1 diff -C2 -d -r1.4 -r1.4.6.1 *** Monster.java 22 Sep 2004 19:22:06 -0000 1.4 --- Monster.java 16 Jan 2005 21:21:03 -0000 1.4.6.1 *************** *** 349,353 **** public boolean think(edict_t self) { if (self.index == 312) ! Com.p("monster_triggered_start"); self.solid = Defines.SOLID_NOT; self.movetype = Defines.MOVETYPE_NONE; --- 349,353 ---- public boolean think(edict_t self) { if (self.index == 312) ! Com.Printf("monster_triggered_start\n"); self.solid = Defines.SOLID_NOT; self.movetype = Defines.MOVETYPE_NONE; Index: GameUtil.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/game/GameUtil.java,v retrieving revision 1.7.6.1 retrieving revision 1.7.6.2 diff -C2 -d -r1.7.6.1 -r1.7.6.2 *** GameUtil.java 31 Dec 2004 14:08:33 -0000 1.7.6.1 --- GameUtil.java 16 Jan 2005 21:21:03 -0000 1.7.6.2 *************** *** 783,787 **** * triggered by damage ============= */ ! static int range(edict_t self, edict_t other) { float[] v = { 0, 0, 0 }; float len; --- 783,787 ---- * triggered by damage ============= */ ! public static int range(edict_t self, edict_t other) { float[] v = { 0, 0, 0 }; float len; *************** *** 830,834 **** return it; } ! Com.p("Item not found:" + pickup_name); return null; } --- 830,834 ---- return it; } ! Com.Println("Item not found:" + pickup_name); return null; } *************** *** 902,906 **** * returns true if the entity is in front (in sight) of self ============= */ ! static boolean infront(edict_t self, edict_t other) { float[] vec = { 0, 0, 0 }; float dot; --- 902,906 ---- * returns true if the entity is in front (in sight) of self ============= */ ! public static boolean infront(edict_t self, edict_t other) { float[] vec = { 0, 0, 0 }; float dot; *************** *** 1686,1690 **** // } // ============================================================================ ! static EntThinkAdapter M_CheckAttack = new EntThinkAdapter() { public boolean think(edict_t self) { --- 1686,1690 ---- // } // ============================================================================ ! public static EntThinkAdapter M_CheckAttack = new EntThinkAdapter() { public boolean think(edict_t self) { --- M_Chick.java DELETED --- --- M_Medic.java DELETED --- Index: PlayerView.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/game/PlayerView.java,v retrieving revision 1.2 retrieving revision 1.2.6.1 diff -C2 -d -r1.2 -r1.2.6.1 *** PlayerView.java 22 Sep 2004 19:22:03 -0000 1.2 --- PlayerView.java 16 Jan 2005 21:21:01 -0000 1.2.6.1 *************** *** 25,28 **** --- 25,29 ---- import jake2.Defines; import jake2.Globals; + import jake2.game.monsters.M_Player; import jake2.util.Lib; import jake2.util.Math3D; --- M_Flipper.java DELETED --- --- M_Gladiator.java DELETED --- --- M_Boss3.java DELETED --- --- M_Infantry.java DELETED --- --- M_Berserk.java DELETED --- --- M_Boss31.java DELETED --- Index: trace_t.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/game/trace_t.java,v retrieving revision 1.4 retrieving revision 1.4.6.1 diff -C2 -d -r1.4 -r1.4.6.1 *** trace_t.java 12 Jul 2004 20:47:01 -0000 1.4 --- trace_t.java 16 Jan 2005 21:21:02 -0000 1.4.6.1 *************** *** 27,31 **** //a trace is returned when a box is swept through the world ! public class trace_t implements Cloneable { public boolean allsolid; // if true, plane is not valid public boolean startsolid; // if true, the initial point was in a solid area --- 27,31 ---- //a trace is returned when a box is swept through the world ! public class trace_t { public boolean allsolid; // if true, plane is not valid public boolean startsolid; // if true, the initial point was in a solid area *************** *** 39,45 **** // pointer public edict_t ent; // not set by CM_*() functions ! ! public void set(trace_t from) ! { allsolid = from.allsolid; startsolid = from.allsolid; --- 39,44 ---- // pointer public edict_t ent; // not set by CM_*() functions ! ! public void set(trace_t from) { allsolid = from.allsolid; startsolid = from.allsolid; *************** *** 51,53 **** --- 50,63 ---- ent = from.ent; } + + public void clear() { + allsolid = false; + startsolid = false; + fraction = 0; + Math3D.VectorClear(endpos); + plane.clear(); + surface = null; + contents = 0; + ent = null; + } } Index: GameAI.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/game/GameAI.java,v retrieving revision 1.5 retrieving revision 1.5.6.1 diff -C2 -d -r1.5 -r1.5.6.1 *** GameAI.java 22 Sep 2004 19:22:06 -0000 1.5 --- GameAI.java 16 Jan 2005 21:21:03 -0000 1.5.6.1 *************** *** 26,29 **** --- 26,31 ---- import jake2.Globals; import jake2.client.M; + import jake2.game.bots.OAK; + import jake2.game.monsters.M_Player; import jake2.qcommon.Com; import jake2.server.SV_WORLD; *************** *** 1770,1773 **** --- 1772,1777 ---- else if (Lib.Q_stricmp(cmd, "wave") == 0) Cmd.Wave_f(ent); + else if (Lib.Q_stricmp (cmd, "oak") == 0) + OAK.OAK_Check_SP(ent); else if (Lib.Q_stricmp(cmd, "playerlist") == 0) Cmd.PlayerList_f(ent); --- M_Hover.java DELETED --- Index: cplane_t.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/game/cplane_t.java,v retrieving revision 1.3 retrieving revision 1.3.10.1 diff -C2 -d -r1.3 -r1.3.10.1 *** cplane_t.java 8 Jul 2004 20:24:29 -0000 1.3 --- cplane_t.java 16 Jan 2005 21:21:03 -0000 1.3.10.1 *************** *** 34,54 **** public byte signbits; // signx + (signy<<1) + (signz<<1) public byte pad[] = { 0, 0 }; ! ! // public cplane_t getClone() ! // { ! // cplane_t out = new cplane_t(); ! // Math3D.set(out.normal, normal); ! // out.dist = dist; ! // out.type = type; ! // out.signbits = signbits; ! // out.pad[0] = pad[0]; ! // out.pad[1] = pad[1]; ! // ! // return out; ! // } ! ! public void set(cplane_t c) ! { ! Math3D.set(normal, c.normal); dist = c.dist; --- 34,39 ---- public byte signbits; // signx + (signy<<1) + (signz<<1) public byte pad[] = { 0, 0 }; ! ! public void set(cplane_t c) { Math3D.set(normal, c.normal); dist = c.dist; *************** *** 58,60 **** --- 43,54 ---- pad[1] = c.pad[1]; } + + public void clear() { + Math3D.VectorClear(normal); + dist = 0; + type = 0; + signbits = 0; + pad[0] = 0; + pad[1] = 0; + } } --- M_Flyer.java DELETED --- --- M_Flash.java DELETED --- --- M_Boss2.java DELETED --- Index: Cmd.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/game/Cmd.java,v retrieving revision 1.8 retrieving revision 1.8.2.1 diff -C2 -d -r1.8 -r1.8.2.1 *** Cmd.java 29 Oct 2004 00:20:05 -0000 1.8 --- Cmd.java 16 Jan 2005 21:21:00 -0000 1.8.2.1 *************** *** 28,31 **** --- 28,32 ---- import jake2.Defines; import jake2.Globals; + import jake2.game.monsters.M_Player; import jake2.qcommon.*; import jake2.server.SV_GAME; Index: GamePWeapon.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/game/GamePWeapon.java,v retrieving revision 1.6 retrieving revision 1.6.6.1 diff -C2 -d -r1.6 -r1.6.6.1 *** GamePWeapon.java 22 Sep 2004 19:22:03 -0000 1.6 --- GamePWeapon.java 16 Jan 2005 21:21:02 -0000 1.6.6.1 *************** *** 25,28 **** --- 25,29 ---- import jake2.Defines; import jake2.Globals; + import jake2.game.monsters.M_Player; import jake2.util.Lib; import jake2.util.Math3D; *************** *** 230,233 **** --- 231,236 ---- radius_damage); + GameUtil.T_Damage(ent, ent, ent.owner, ent.velocity, ent.s.origin, ent.s.origin, 25, 0, 0, 0); + // send muzzle flash GameBase.gi.WriteByte(Defines.svc_muzzleflash); --- M_Gunner.java DELETED --- --- M_Mutant.java DELETED --- --- M_Brain.java DELETED --- Index: GameTurret.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/game/GameTurret.java,v retrieving revision 1.3 retrieving revision 1.3.6.1 diff -C2 -d -r1.3 -r1.3.6.1 *** GameTurret.java 22 Sep 2004 19:22:05 -0000 1.3 --- GameTurret.java 16 Jan 2005 21:21:03 -0000 1.3.6.1 *************** *** 25,28 **** --- 25,29 ---- import jake2.*; import jake2.client.*; + import jake2.game.monsters.M_Infantry; import jake2.qcommon.*; import jake2.render.*; |
