[Jake2-commits] jake2/src/jake2/server SV_WORLD.java,1.7,1.8

[Carsten W. <ca...@us...>]

Update of /cvsroot/jake2/jake2/src/jake2/server
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv31626/src/jake2/server

Modified Files:
	SV_WORLD.java 
Log Message:
debugging code disabled; clean up

Index: SV_WORLD.java
===================================================================
RCS file: /cvsroot/jake2/jake2/src/jake2/server/SV_WORLD.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** SV_WORLD.java	22 Sep 2004 19:22:12 -0000	1.7
--- SV_WORLD.java	27 Feb 2007 14:11:00 -0000	1.8
***************
*** 19,32 ****
   */
  // Created on 07.01.2000 by RST.
! // $Id$
  package jake2.server;
  
  import jake2.Defines;
  import jake2.Globals;
! import jake2.game.GameBase;
! import jake2.game.cmodel_t;
! import jake2.game.edict_t;
! import jake2.game.link_t;
! import jake2.game.trace_t;
  import jake2.qcommon.CM;
  import jake2.qcommon.Com;
--- 19,28 ----
   */
  // Created on 07.01.2000 by RST.
! 
  package jake2.server;
  
  import jake2.Defines;
  import jake2.Globals;
! import jake2.game.*;
  import jake2.qcommon.CM;
  import jake2.qcommon.Com;
***************
*** 106,111 ****
          anode = SV_WORLD.sv_areanodes[SV_WORLD.sv_numareanodes];
          // just for debugging (rst)
!         Math3D.VectorCopy(mins, anode.mins_rst);
!         Math3D.VectorCopy(maxs, anode.maxs_rst);
          SV_WORLD.sv_numareanodes++;
          ClearLink(anode.trigger_edicts);
--- 102,107 ----
          anode = SV_WORLD.sv_areanodes[SV_WORLD.sv_numareanodes];
          // just for debugging (rst)
! //        Math3D.VectorCopy(mins, anode.mins_rst);
! //        Math3D.VectorCopy(maxs, anode.maxs_rst);
          SV_WORLD.sv_numareanodes++;
          ClearLink(anode.trigger_edicts);
***************
*** 318,323 ****
          link_t l, next, start;
          edict_t check;
-         int count;
-         count = 0;
          // touch linked edicts
          if (SV_WORLD.area_type == Defines.AREA_SOLID)
--- 314,317 ----
***************
*** 376,380 ****
          int contents, c2;
          int headnode;
-         float angles[];
          // get base contents from world
          contents = CM.PointContents(p, SV_INIT.sv.models[1].headnode);
--- 370,373 ----
***************
*** 386,392 ****
              // might intersect, so do an exact clip
              headnode = SV_HullForEntity(hit);
!             angles = hit.s.angles;
!             if (hit.solid != Defines.SOLID_BSP)
!                 angles = Globals.vec3_origin; // boxes don't rotate
              c2 = CM.TransformedPointContents(p, headnode, hit.s.origin,
                      hit.s.angles);
--- 379,384 ----
              // might intersect, so do an exact clip
              headnode = SV_HullForEntity(hit);
!             if (hit.solid != Defines.SOLID_BSP) {
! 	    }
              c2 = CM.TransformedPointContents(p, headnode, hit.s.origin,
                      hit.s.angles);