[Jake2-commits] jake2/src/jake2/game PlayerHud.java,1.6,1.7

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

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

Modified Files:
	PlayerHud.java 
Log Message:
coop, out of bounds fixed, score board bugs fixed.

Index: PlayerHud.java
===================================================================
RCS file: /cvsroot/jake2/jake2/src/jake2/game/PlayerHud.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** PlayerHud.java	22 Sep 2004 19:22:03 -0000	1.6
--- PlayerHud.java	6 Feb 2005 19:13:01 -0000	1.7
***************
*** 21,24 ****
--- 21,25 ----
  // Created on 28.12.2003 by RST.
  // $Id$
+ 
  package jake2.game;
  
***************
*** 110,116 ****
                          continue;
                      // strip players of all keys between units
!                     for (n = 1; n < Defines.MAX_ITEMS; n++) {
!                         if ((GameAI.itemlist[n].flags & Defines.IT_KEY) != 0)
!                             client.client.pers.inventory[n] = 0;
                      }
                  }
--- 111,119 ----
                          continue;
                      // strip players of all keys between units
!                     for (n = 1; n < GameAI.itemlist.length; n++) {
!                         // null pointer exception fixed. (RST) 
!                         if (GameAI.itemlist[n] != null)
!                             if ((GameAI.itemlist[n].flags & Defines.IT_KEY) != 0)
!                                 client.client.pers.inventory[n] = 0;
                      }
                  }
***************
*** 147,151 ****
                      continue;
                  ent = es.o;
- 
              }
          }
--- 150,153 ----
***************
*** 203,213 ****
  
          // print level name and exit rules
-         //string[0] = 0;
-         //stringlength = strlen(string);
  
          // add the clients in sorted order
          if (total > 12)
              total = 12;
! 
          for (i = 0; i < total; i++) {
              cl = GameBase.game.clients[sorted[i]];
--- 205,213 ----
  
          // print level name and exit rules
  
          // add the clients in sorted order
          if (total > 12)
              total = 12;
!         
          for (i = 0; i < total; i++) {
              cl = GameBase.game.clients[sorted[i]];
***************
*** 229,243 ****
                  string.append("xv ").append(x + 32).append(" yv ").append(y)
                          .append(" picn ").append(tag);
-                 /*
-                  * //Com_sprintf(entry, sizeof(entry), "xv %i yv %i picn %s ", x +
-                  * 32, y, tag); j = strlen(entry); if (stringlength + j > 1024)
-                  * break; strcpy(string + stringlength, entry); stringlength +=
-                  * j;
-                  */
              }
  
              // send the layout
              string
!                     .append("client ")
                      .append(x)
                      .append(" ")
--- 229,237 ----
                  string.append("xv ").append(x + 32).append(" yv ").append(y)
                          .append(" picn ").append(tag);
              }
  
              // send the layout
              string
!                     .append(" client ")
                      .append(x)
                      .append(" ")
***************
*** 251,264 ****
                      .append(" ")
                      .append(
!                             (GameBase.level.framenum - cl.resp.enterframe) / 600);
! 
!             /*
!              * Com_sprintf( entry, sizeof(entry), "client %i %i %i %i %i %i ",
!              * x, y, sorted[i], cl.resp.score, cl.ping, (level.framenum -
!              * cl.resp.enterframe) / 600); j = strlen(entry); if (stringlength +
!              * j > 1024) break; strcpy(string + stringlength, entry);
!              * stringlength += j;
!              */
! 
          }
  
--- 245,249 ----
                      .append(" ")
                      .append(
!                             (GameBase.level.framenum - cl.resp.enterframe) / 600);           
          }