[Jake2-commits] jake2/src/jake2/qcommon CM.java,1.9,1.10

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

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

Modified Files:
	CM.java 
Log Message:
cosmetic

Index: CM.java
===================================================================
RCS file: /cvsroot/jake2/jake2/src/jake2/qcommon/CM.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** CM.java	21 Jan 2005 00:46:54 -0000	1.9
--- CM.java	6 Feb 2005 19:25:14 -0000	1.10
***************
*** 217,221 ****
      public static cmodel_t CM_LoadMap(String name, boolean clientload,
              int checksum[]) {
!         Com.DPrintf("CM_LoadMap...\n");
          byte buf[];
          int i;
--- 217,221 ----
      public static cmodel_t CM_LoadMap(String name, boolean clientload,
              int checksum[]) {
!         Com.DPrintf("CM_LoadMap(" + name + ")...\n");
          byte buf[];
          int i;
***************
*** 280,284 ****
  
          // load into heap
!         CMod_LoadSurfaces(header.lumps[Defines.LUMP_TEXINFO]); // ok.
          CMod_LoadLeafs(header.lumps[Defines.LUMP_LEAFS]);
          CMod_LoadLeafBrushes(header.lumps[Defines.LUMP_LEAFBRUSHES]);
--- 280,284 ----
  
          // load into heap
!         CMod_LoadSurfaces(header.lumps[Defines.LUMP_TEXINFO]); // ok        
          CMod_LoadLeafs(header.lumps[Defines.LUMP_LEAFS]);
          CMod_LoadLeafBrushes(header.lumps[Defines.LUMP_LEAFBRUSHES]);
***************
*** 289,297 ****
  
          CMod_LoadNodes(header.lumps[Defines.LUMP_NODES]);
!         CMod_LoadAreas(header.lumps[Defines.LUMP_AREAS]);
!         CMod_LoadAreaPortals(header.lumps[Defines.LUMP_AREAPORTALS]);
          CMod_LoadVisibility(header.lumps[Defines.LUMP_VISIBILITY]);
          CMod_LoadEntityString(header.lumps[Defines.LUMP_ENTITIES]);
! 
          FS.FreeFile(buf);
  
--- 289,297 ----
  
          CMod_LoadNodes(header.lumps[Defines.LUMP_NODES]);
!         CMod_LoadAreas(header.lumps[Defines.LUMP_AREAS]);    
!         CMod_LoadAreaPortals(header.lumps[Defines.LUMP_AREAPORTALS]);       
          CMod_LoadVisibility(header.lumps[Defines.LUMP_VISIBILITY]);
          CMod_LoadEntityString(header.lumps[Defines.LUMP_ENTITIES]);
!         
          FS.FreeFile(buf);
  
***************
*** 319,323 ****
       */
      public static void CMod_LoadSubmodels(lump_t l) {
!         Com.DPrintf("CMod_LoadSubmodels...\n");
          qfiles.dmodel_t in;
          cmodel_t out;
--- 319,323 ----
       */
      public static void CMod_LoadSubmodels(lump_t l) {
!         Com.DPrintf("CMod_LoadSubmodels()\n");
          qfiles.dmodel_t in;
          cmodel_t out;
***************
*** 325,329 ****
  
          if ((l.filelen % qfiles.dmodel_t.SIZE) != 0)
!             Com.Error(Defines.ERR_DROP, "MOD_LoadBmodel: funny lump size");
  
          count = l.filelen / qfiles.dmodel_t.SIZE;
--- 325,329 ----
  
          if ((l.filelen % qfiles.dmodel_t.SIZE) != 0)
!             Com.Error(Defines.ERR_DROP, "CMod_LoadBmodel: funny lump size");
  
          count = l.filelen / qfiles.dmodel_t.SIZE;
***************
*** 334,338 ****
              Com.Error(Defines.ERR_DROP, "Map has too many models");
  
!         Com.DPrintf("   numcmodels=" + count + "\n");
          numcmodels = count;
  
--- 334,338 ----
              Com.Error(Defines.ERR_DROP, "Map has too many models");
  
!         Com.DPrintf(" numcmodels=" + count + "\n");
          numcmodels = count;
  
***************
*** 371,375 ****
       */
      public static void CMod_LoadSurfaces(lump_t l) {
!         Com.DPrintf("CMod_LoadSurfaces...\n");
          texinfo_t in;
          mapsurface_t out;
--- 371,375 ----
       */
      public static void CMod_LoadSurfaces(lump_t l) {
!         Com.DPrintf("CMod_LoadSurfaces()\n");
          texinfo_t in;
          mapsurface_t out;
***************
*** 386,390 ****
  
          numtexinfo = count;
!         Com.DPrintf("numtexinfo=" + count + "\n");
          if (debugloadmap)
              Com.DPrintf("surfaces:\n");
--- 386,390 ----
  
          numtexinfo = count;
!         Com.DPrintf(" numtexinfo=" + count + "\n");
          if (debugloadmap)
              Com.DPrintf("surfaces:\n");
***************
*** 415,419 ****
       */
      public static void CMod_LoadNodes(lump_t l) {
!         Com.DPrintf("CMod_LoadNodes...\n");
          qfiles.dnode_t in;
          int child;
--- 415,419 ----
       */
      public static void CMod_LoadNodes(lump_t l) {
!         Com.DPrintf("CMod_LoadNodes()\n");
          qfiles.dnode_t in;
          int child;
***************
*** 432,436 ****
  
          numnodes = count;
!         Com.DPrintf("   numnodes=" + count + "\n");
  
          if (debugloadmap) {
--- 432,436 ----
  
          numnodes = count;
!         Com.DPrintf(" numnodes=" + count + "\n");
  
          if (debugloadmap) {
***************
*** 461,465 ****
       */
      public static void CMod_LoadBrushes(lump_t l) {
!         Com.DPrintf("CMod_LoadBrushes...\n");
          qfiles.dbrush_t in;
          cbrush_t out;
--- 461,465 ----
       */
      public static void CMod_LoadBrushes(lump_t l) {
!         Com.DPrintf("CMod_LoadBrushes()\n");
          qfiles.dbrush_t in;
          cbrush_t out;
***************
*** 475,479 ****
  
          numbrushes = count;
!         Com.DPrintf("   numbrushes=" + count + "\n");
          if (debugloadmap) {
              Com.DPrintf("brushes:(firstbrushside, numsides, contents)\n");
--- 475,479 ----
  
          numbrushes = count;
!         Com.DPrintf(" numbrushes=" + count + "\n");
          if (debugloadmap) {
              Com.DPrintf("brushes:(firstbrushside, numsides, contents)\n");
***************
*** 500,504 ****
       */
      public static void CMod_LoadLeafs(lump_t l) {
!         Com.DPrintf("CMod_LoadLeafs...\n");
          int i;
          cleaf_t out;
--- 500,504 ----
       */
      public static void CMod_LoadLeafs(lump_t l) {
!         Com.DPrintf("CMod_LoadLeafs()\n");
          int i;
          cleaf_t out;
***************
*** 518,528 ****
              Com.Error(Defines.ERR_DROP, "Map has too many planes");
  
!         Com.DPrintf("   numleafes=" + count + "\n");
  
          numleafs = count;
          numclusters = 0;
          if (debugloadmap)
!             Com
!                     .DPrintf("cleaf-list:(contents, cluster, area, firstleafbrush, numleafbrushes)\n");
          for (i = 0; i < count; i++) {
              in = new qfiles.dleaf_t(cmod_base, i * qfiles.dleaf_t.SIZE
--- 518,527 ----
              Com.Error(Defines.ERR_DROP, "Map has too many planes");
  
!         Com.DPrintf(" numleafes=" + count + "\n");
  
          numleafs = count;
          numclusters = 0;
          if (debugloadmap)
!             Com.DPrintf("cleaf-list:(contents, cluster, area, firstleafbrush, numleafbrushes)\n");
          for (i = 0; i < count; i++) {
              in = new qfiles.dleaf_t(cmod_base, i * qfiles.dleaf_t.SIZE
***************
*** 548,552 ****
          }
  
!         Com.DPrintf("   numclusters=" + numclusters + "\n");
  
          if (map_leafs[0].contents != Defines.CONTENTS_SOLID)
--- 547,551 ----
          }
  
!         Com.DPrintf(" numclusters=" + numclusters + "\n");
  
          if (map_leafs[0].contents != Defines.CONTENTS_SOLID)
***************
*** 571,575 ****
       */
      public static void CMod_LoadPlanes(lump_t l) {
!         Com.DPrintf("CMod_LoadPlanes...\n");
          int i, j;
          cplane_t out;
--- 570,574 ----
       */
      public static void CMod_LoadPlanes(lump_t l) {
!         Com.DPrintf("CMod_LoadPlanes()\n");
          int i, j;
          cplane_t out;
***************
*** 590,594 ****
              Com.Error(Defines.ERR_DROP, "Map has too many planes");
  
!         Com.DPrintf("   numplanes=" + count + "\n");
  
          numplanes = count;
--- 589,593 ----
              Com.Error(Defines.ERR_DROP, "Map has too many planes");
  
!         Com.DPrintf(" numplanes=" + count + "\n");
  
          numplanes = count;
***************
*** 629,633 ****
       */
      public static void CMod_LoadLeafBrushes(lump_t l) {
!         Com.DPrintf("CMod_LoadLeafBrushes...\n");
          int i;
          int out[];
--- 628,632 ----
       */
      public static void CMod_LoadLeafBrushes(lump_t l) {
!         Com.DPrintf("CMod_LoadLeafBrushes()\n");
          int i;
          int out[];
***************
*** 640,644 ****
          count = l.filelen / 2;
  
!         Com.DPrintf("   numbrushes=" + count + "\n");
  
          if (count < 1)
--- 639,643 ----
          count = l.filelen / 2;
  
!         Com.DPrintf(" numbrushes=" + count + "\n");
  
          if (count < 1)
***************
*** 671,675 ****
       */
      public static void CMod_LoadBrushSides(lump_t l) {
!         Com.DPrintf("CMod_LoadBrushSides...\n");
          int i, j;
          cbrushside_t out;
--- 670,674 ----
       */
      public static void CMod_LoadBrushSides(lump_t l) {
!         Com.DPrintf("CMod_LoadBrushSides()\n");
          int i, j;
          cbrushside_t out;
***************
*** 688,692 ****
          numbrushsides = count;
  
!         Com.DPrintf("   numbrushsides=" + count + "\n");
  
          if (debugloadmap) {
--- 687,691 ----
          numbrushsides = count;
  
!         Com.DPrintf(" numbrushsides=" + count + "\n");
  
          if (debugloadmap) {
***************
*** 728,732 ****
       */
      public static void CMod_LoadAreas(lump_t l) {
!         Com.DPrintf("CMod_LoadAreas...\n");
          int i;
          carea_t out;
--- 727,731 ----
       */
      public static void CMod_LoadAreas(lump_t l) {
!         Com.DPrintf("CMod_LoadAreas()\n");
          int i;
          carea_t out;
***************
*** 742,746 ****
              Com.Error(Defines.ERR_DROP, "Map has too many areas");
  
!         Com.DPrintf("   numareas=" + count + "\n");
          numareas = count;
  
--- 741,745 ----
              Com.Error(Defines.ERR_DROP, "Map has too many areas");
  
!         Com.DPrintf(" numareas=" + count + "\n");
          numareas = count;
  
***************
*** 770,774 ****
       */
      public static void CMod_LoadAreaPortals(lump_t l) {
!         Com.DPrintf("CMod_LoadAreaPortals...\n");
          int i;
          qfiles.dareaportal_t out;
--- 769,773 ----
       */
      public static void CMod_LoadAreaPortals(lump_t l) {
!         Com.DPrintf("CMod_LoadAreaPortals()\n");
          int i;
          qfiles.dareaportal_t out;
***************
*** 784,788 ****
  
          numareaportals = count;
!         Com.DPrintf("   numareaportals=" + count + "\n");
          if (debugloadmap) {
              Com.DPrintf("areaportals(portalnum, otherarea)\n");
--- 783,787 ----
  
          numareaportals = count;
!         Com.DPrintf(" numareaportals=" + count + "\n");
          if (debugloadmap) {
              Com.DPrintf("areaportals(portalnum, otherarea)\n");
***************
*** 809,818 ****
       */
      public static void CMod_LoadVisibility(lump_t l) {
!         Com.DPrintf("CMod_LoadVisibility...\n");
          int i;
  
          numvisibility = l.filelen;
  
!         Com.DPrintf("   numvisibility=" + numvisibility + "\n");
  
          if (l.filelen > Defines.MAX_MAP_VISIBILITY)
--- 808,817 ----
       */
      public static void CMod_LoadVisibility(lump_t l) {
!         Com.DPrintf("CMod_LoadVisibility()\n");
          int i;
  
          numvisibility = l.filelen;
  
!         Com.DPrintf(" numvisibility=" + numvisibility + "\n");
  
          if (l.filelen > Defines.MAX_MAP_VISIBILITY)
***************
*** 832,836 ****
       */
      public static void CMod_LoadEntityString(lump_t l) {
!         Com.DPrintf("CMod_LoadEntityString...\n");
  
          numentitychars = l.filelen;
--- 831,835 ----
       */
      public static void CMod_LoadEntityString(lump_t l) {
!         Com.DPrintf("CMod_LoadEntityString()\n");
  
          numentitychars = l.filelen;
***************
*** 840,847 ****
  
          int x = 0;
!         for (; x < l.filelen && cmod_base[x + l.fileofs] != 0; x++)
!             ;
  
          map_entitystring = new String(cmod_base, l.fileofs, x).trim();
      }
  
--- 839,848 ----
  
          int x = 0;
!         for (; x < l.filelen && cmod_base[x + l.fileofs] != 0; x++);
  
          map_entitystring = new String(cmod_base, l.fileofs, x).trim();
+         Com.dprintln("entitystring=" + map_entitystring.length() + 
+                 " bytes, [" + map_entitystring.substring(0, Math.min (
+                         map_entitystring.length(), 15)) + "...]" );
      }