[Jake2-commits] jake2/src/jake2/game GameTarget.java,1.4,1.5 GameBase.java,1.9,1.10 Fire.java,1.4,1.5 GameFunc.java,1.5,1.6

[Rene S. <sa...@us...>]

Update of /cvsroot/jake2/jake2/src/jake2/game
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17458/src/jake2/game

Modified Files:
	GameTarget.java GameBase.java Fire.java GameFunc.java 
Log Message:
 VectorEquals instead of VectorCompare

Index: GameTarget.java
===================================================================
RCS file: /cvsroot/jake2/jake2/src/jake2/game/GameTarget.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** GameTarget.java	19 Feb 2005 21:18:44 -0000	1.4
--- GameTarget.java	20 Feb 2005 21:50:36 -0000	1.5
***************
*** 609,613 ****
                  Math3D.VectorSubtract(point, self.s.origin, self.movedir);
                  Math3D.VectorNormalize(self.movedir);
!                 if (0 == Math3D.VectorCompare(self.movedir, last_movedir))
                      self.spawnflags |= 0x80000000;
              }
--- 609,613 ----
                  Math3D.VectorSubtract(point, self.s.origin, self.movedir);
                  Math3D.VectorNormalize(self.movedir);
!                 if (!Math3D.VectorEquals(self.movedir, last_movedir))
                      self.spawnflags |= 0x80000000;
              }

Index: Fire.java
===================================================================
RCS file: /cvsroot/jake2/jake2/src/jake2/game/Fire.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Fire.java	22 Sep 2004 19:22:02 -0000	1.4
--- Fire.java	20 Feb 2005 21:50:36 -0000	1.5
***************
*** 146,150 ****
                  Math3D.VectorCopy(tr.endpos, water_start);
  
!                 if (0 == Math3D.VectorCompare(start, tr.endpos)) {
                      if ((tr.contents & Defines.CONTENTS_WATER) != 0) {
                          if (Lib.strcmp(tr.surface.name, "*brwater") == 0)
--- 146,150 ----
                  Math3D.VectorCopy(tr.endpos, water_start);
  
!                 if (!Math3D.VectorEquals(start, tr.endpos)) {
                      if ((tr.contents & Defines.CONTENTS_WATER) != 0) {
                          if (Lib.strcmp(tr.surface.name, "*brwater") == 0)

Index: GameBase.java
===================================================================
RCS file: /cvsroot/jake2/jake2/src/jake2/game/GameBase.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** GameBase.java	13 Feb 2005 17:02:45 -0000	1.9
--- GameBase.java	20 Feb 2005 21:50:36 -0000	1.10
***************
*** 287,293 ****
  
      public static void G_SetMovedir(float[] angles, float[] movedir) {
!         if (Math3D.VectorCompare(angles, VEC_UP) != 0) {
              Math3D.VectorCopy(MOVEDIR_UP, movedir);
!         } else if (Math3D.VectorCompare(angles, VEC_DOWN) != 0) {
              Math3D.VectorCopy(MOVEDIR_DOWN, movedir);
          } else {
--- 287,293 ----
  
      public static void G_SetMovedir(float[] angles, float[] movedir) {
!         if (Math3D.VectorEquals(angles, VEC_UP)) {
              Math3D.VectorCopy(MOVEDIR_UP, movedir);
!         } else if (Math3D.VectorEquals(angles, VEC_DOWN)) {
              Math3D.VectorCopy(MOVEDIR_DOWN, movedir);
          } else {

Index: GameFunc.java
===================================================================
RCS file: /cvsroot/jake2/jake2/src/jake2/game/GameFunc.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** GameFunc.java	22 Sep 2004 19:22:04 -0000	1.5
--- GameFunc.java	20 Feb 2005 21:50:36 -0000	1.6
***************
*** 669,673 ****
                          move);
  
!             if (Math3D.VectorCompare(move, Globals.vec3_origin) != 0) {
                  AngleMove_Done.think(ent);
                  return true;
--- 669,673 ----
                          move);
  
!             if (Math3D.VectorEquals(move, Globals.vec3_origin)) {
                  AngleMove_Done.think(ent);
                  return true;
***************
*** 882,886 ****
      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)) {
                  self.s.sound = 0;
                  Math3D.VectorClear(self.avelocity);
--- 882,886 ----
      static EntUseAdapter rotating_use = new EntUseAdapter() {
          public void use(edict_t self, edict_t other, edict_t activator) {
!             if (!Math3D.VectorEquals(self.avelocity, Globals.vec3_origin)) {
                  self.s.sound = 0;
                  Math3D.VectorClear(self.avelocity);
***************
*** 1973,1977 ****
          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))
                  return;
  
--- 1973,1977 ----
          public void use(edict_t self, edict_t other, edict_t activator) {
              // make sure we're not already moving
!             if (!Math3D.VectorEquals(self.s.origin, Globals.vec3_origin))
                  return;