[Jake2-commits] jake2/src/jake2/client CL.java,1.16,1.16.2.1 SCR.java,1.8.6.1,1.8.6.2

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

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

Modified Files:
      Tag: RST
	CL.java SCR.java 
Log Message:
merged from head

Index: SCR.java
===================================================================
RCS file: /cvsroot/jake2/jake2/src/jake2/client/SCR.java,v
retrieving revision 1.8.6.1
retrieving revision 1.8.6.2
diff -C2 -d -r1.8.6.1 -r1.8.6.2
*** SCR.java	16 Jan 2005 21:20:58 -0000	1.8.6.1
--- SCR.java	30 Jan 2005 19:47:18 -0000	1.8.6.2
***************
*** 1127,1142 ****
                  token = Com.Parse(ph);
                  value = cl.frame.playerstate.stats[Lib.atoi(token)];
!                 if (value == 0) { // skip to endif
!                     //					while (s && strcmp(token, "endif") )
!                     //					{
!                     //						token = Com.Parse(ph);
!                     //					}
! 
!                     while (!ph.isEof()
!                             && !(token = Com.Parse(ph)).equals("endif"))
!                         ;
! 
                  }
- 
                  continue;
              }
--- 1127,1134 ----
                  token = Com.Parse(ph);
                  value = cl.frame.playerstate.stats[Lib.atoi(token)];
!                 if (value == 0) {
!                     // skip to endif
!                     while (!ph.isEof() && !(token = Com.Parse(ph)).equals("endif"));
                  }
                  continue;
              }

Index: CL.java
===================================================================
RCS file: /cvsroot/jake2/jake2/src/jake2/client/CL.java,v
retrieving revision 1.16
retrieving revision 1.16.2.1
diff -C2 -d -r1.16 -r1.16.2.1
*** CL.java	7 Nov 2004 19:38:40 -0000	1.16
--- CL.java	30 Jan 2005 19:47:17 -0000	1.16.2.1
***************
*** 44,48 ****
   */
  public final class CL {
! 
      static int precache_check; // for autodownload of precache items
  
--- 44,48 ----
   */
  public final class CL {
!     
      static int precache_check; // for autodownload of precache items
  
***************
*** 207,210 ****
--- 207,211 ----
                  // baselines
                  //memset( nullstate, 0, sizeof(nullstate));
+                 nullstate.clear();
                  for (i = 0; i < Defines.MAX_EDICTS; i++) {
                      ent = Globals.cl_entities[i].baseline;
***************
*** 1292,1305 ****
          CL_input.InitInput();
  
!         // never used !!
!         //		adr0 = Cvar.Get("adr0", "", CVAR_ARCHIVE);
!         //		adr1 = Cvar.Get("adr1", "", CVAR_ARCHIVE);
!         //		adr2 = Cvar.Get("adr2", "", CVAR_ARCHIVE);
!         //		adr3 = Cvar.Get("adr3", "", CVAR_ARCHIVE);
!         //		adr4 = Cvar.Get("adr4", "", CVAR_ARCHIVE);
!         //		adr5 = Cvar.Get("adr5", "", CVAR_ARCHIVE);
!         //		adr6 = Cvar.Get("adr6", "", CVAR_ARCHIVE);
!         //		adr7 = Cvar.Get("adr7", "", CVAR_ARCHIVE);
!         //		adr8 = Cvar.Get("adr8", "", CVAR_ARCHIVE);
  
          //
--- 1293,1305 ----
          CL_input.InitInput();
  
!         Cvar.Get("adr0", "", Defines.CVAR_ARCHIVE);
!         Cvar.Get("adr1", "", Defines.CVAR_ARCHIVE);
!         Cvar.Get("adr2", "", Defines.CVAR_ARCHIVE);
!         Cvar.Get("adr3", "", Defines.CVAR_ARCHIVE);
!         Cvar.Get("adr4", "", Defines.CVAR_ARCHIVE);
!         Cvar.Get("adr5", "", Defines.CVAR_ARCHIVE);
!         Cvar.Get("adr6", "", Defines.CVAR_ARCHIVE);
!         Cvar.Get("adr7", "", Defines.CVAR_ARCHIVE);
!         Cvar.Get("adr8", "", Defines.CVAR_ARCHIVE);
  
          //