diff options
Diffstat (limited to 'src/jake2/game')
| -rw-r--r-- | src/jake2/game/Fire.java | 4 | ||||
| -rw-r--r-- | src/jake2/game/GameBase.java | 6 | ||||
| -rw-r--r-- | src/jake2/game/GameFunc.java | 8 | ||||
| -rw-r--r-- | src/jake2/game/GameTarget.java | 4 |
4 files changed, 11 insertions, 11 deletions
diff --git a/src/jake2/game/Fire.java b/src/jake2/game/Fire.java index c5a426e..29254ca 100644 --- a/src/jake2/game/Fire.java +++ b/src/jake2/game/Fire.java @@ -19,7 +19,7 @@ */ // Created on 04.12.2003 by RST. -// $Id: Fire.java,v 1.4 2004-09-22 19:22:02 salomo Exp $ +// $Id: Fire.java,v 1.5 2005-02-20 21:50:36 salomo Exp $ package jake2.game; import jake2.Defines; @@ -145,7 +145,7 @@ public class Fire { water = true; Math3D.VectorCopy(tr.endpos, water_start); - if (0 == Math3D.VectorCompare(start, tr.endpos)) { + if (!Math3D.VectorEquals(start, tr.endpos)) { if ((tr.contents & Defines.CONTENTS_WATER) != 0) { if (Lib.strcmp(tr.surface.name, "*brwater") == 0) color = Defines.SPLASH_BROWN_WATER; diff --git a/src/jake2/game/GameBase.java b/src/jake2/game/GameBase.java index dc6950e..1bf3c28 100644 --- a/src/jake2/game/GameBase.java +++ b/src/jake2/game/GameBase.java @@ -19,7 +19,7 @@ */ // Created on 30.11.2003 by RST. -// $Id: GameBase.java,v 1.9 2005-02-13 17:02:45 cawe Exp $ +// $Id: GameBase.java,v 1.10 2005-02-20 21:50:36 salomo Exp $ /** Father of all GameObjects. */ package jake2.game; @@ -286,9 +286,9 @@ public class GameBase { public static float[] MOVEDIR_DOWN = { 0, 0, -1 }; public static void G_SetMovedir(float[] angles, float[] movedir) { - if (Math3D.VectorCompare(angles, VEC_UP) != 0) { + if (Math3D.VectorEquals(angles, VEC_UP)) { Math3D.VectorCopy(MOVEDIR_UP, movedir); - } else if (Math3D.VectorCompare(angles, VEC_DOWN) != 0) { + } else if (Math3D.VectorEquals(angles, VEC_DOWN)) { Math3D.VectorCopy(MOVEDIR_DOWN, movedir); } else { Math3D.AngleVectors(angles, movedir, null, null); diff --git a/src/jake2/game/GameFunc.java b/src/jake2/game/GameFunc.java index 9a77e17..014e020 100644 --- a/src/jake2/game/GameFunc.java +++ b/src/jake2/game/GameFunc.java @@ -19,7 +19,7 @@ */ // Created on 18.11.2003 by RST. -// $Id: GameFunc.java,v 1.5 2004-09-22 19:22:04 salomo Exp $ +// $Id: GameFunc.java,v 1.6 2005-02-20 21:50:36 salomo Exp $ package jake2.game; import jake2.Defines; @@ -668,7 +668,7 @@ public class GameFunc { Math3D.VectorSubtract(ent.moveinfo.start_angles, ent.s.angles, move); - if (Math3D.VectorCompare(move, Globals.vec3_origin) != 0) { + if (Math3D.VectorEquals(move, Globals.vec3_origin)) { AngleMove_Done.think(ent); return true; } @@ -881,7 +881,7 @@ public class GameFunc { static EntUseAdapter rotating_use = new EntUseAdapter() { public void use(edict_t self, edict_t other, edict_t activator) { - if (0 == Math3D.VectorCompare(self.avelocity, Globals.vec3_origin)) { + if (!Math3D.VectorEquals(self.avelocity, Globals.vec3_origin)) { self.s.sound = 0; Math3D.VectorClear(self.avelocity); self.touch = null; @@ -1972,7 +1972,7 @@ public class GameFunc { public void use(edict_t self, edict_t other, edict_t activator) { // make sure we're not already moving - if (0 == Math3D.VectorCompare(self.s.origin, Globals.vec3_origin)) + if (!Math3D.VectorEquals(self.s.origin, Globals.vec3_origin)) return; GameFunc.Move_Calc(self, self.pos1, door_secret_move1); diff --git a/src/jake2/game/GameTarget.java b/src/jake2/game/GameTarget.java index 94b46bb..3357f2b 100644 --- a/src/jake2/game/GameTarget.java +++ b/src/jake2/game/GameTarget.java @@ -19,7 +19,7 @@ */ // Created on 28.12.2003 by RST. -// $Id: GameTarget.java,v 1.4 2005-02-19 21:18:44 salomo Exp $ +// $Id: GameTarget.java,v 1.5 2005-02-20 21:50:36 salomo Exp $ package jake2.game; import jake2.Defines; @@ -608,7 +608,7 @@ public class GameTarget { point); Math3D.VectorSubtract(point, self.s.origin, self.movedir); Math3D.VectorNormalize(self.movedir); - if (0 == Math3D.VectorCompare(self.movedir, last_movedir)) + if (!Math3D.VectorEquals(self.movedir, last_movedir)) self.spawnflags |= 0x80000000; } |