[Jake2-commits] jake2/src/jake2/client CL_ents.java,1.4,1.5 CL_parse.java,1.5,1.6

[Holger Z. <hz...@us...>]

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

Modified Files:
	CL_ents.java CL_parse.java 
Log Message:
cleanups

Index: CL_ents.java
===================================================================
RCS file: /cvsroot/jake2/jake2/src/jake2/client/CL_ents.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** CL_ents.java	9 Jul 2004 06:50:50 -0000	1.4
--- CL_ents.java	12 Jul 2004 20:47:01 -0000	1.5
***************
*** 235,239 ****
  
  		entity_state_t oldstate=null;
! 		int oldindex, oldnum;
  
  		newframe.parse_entities = cl.parse_entities;
--- 235,239 ----
  
  		entity_state_t oldstate=null;
! 		int oldnum;
  
  		newframe.parse_entities = cl.parse_entities;
***************
*** 241,254 ****
  
  		// delta from the entities present in oldframe
! 		oldindex = 0;
  		if (oldframe == null)
  			oldnum = 99999;
  		else {
! 			if (oldindex >= oldframe.num_entities)
! 				oldnum = 99999;
! 			else {
  				oldstate = cl_parse_entities[(oldframe.parse_entities + oldindex) & (MAX_PARSE_ENTITIES - 1)];
  				oldnum = oldstate.number;
! 			}
  		}
  
--- 241,255 ----
  
  		// delta from the entities present in oldframe
! 		int oldindex = 0;
  		if (oldframe == null)
  			oldnum = 99999;
  		else {
! 			// oldindex == 0. hoz
! //			if (oldindex >= oldframe.num_entities)
! //				oldnum = 99999;
! //			else {
  				oldstate = cl_parse_entities[(oldframe.parse_entities + oldindex) & (MAX_PARSE_ENTITIES - 1)];
  				oldnum = oldstate.number;
! //			}
  		}
  

Index: CL_parse.java
===================================================================
RCS file: /cvsroot/jake2/jake2/src/jake2/client/CL_parse.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** CL_parse.java	9 Jul 2004 06:50:50 -0000	1.5
--- CL_parse.java	12 Jul 2004 20:47:01 -0000	1.6
***************
*** 219,223 ****
  			if (cls.download != null) {
  				// if here, we tried to resume a file but the server said no
! 				fclose(cls.download);
  				cls.download = null;
  			}
--- 219,225 ----
  			if (cls.download != null) {
  				// if here, we tried to resume a file but the server said no
! 				try {
! 					cls.download.close();
! 				} catch (IOException e) {}
  				cls.download = null;
  			}
***************
*** 263,267 ****
  			//			Com.Printf ("100%%\n");
  
! 			fclose(cls.download);
  
  			// rename the temp file to it's final name
--- 265,271 ----
  			//			Com.Printf ("100%%\n");
  
! 			try {
! 				cls.download.close();
! 			} catch (IOException e) {}
  
  			// rename the temp file to it's final name
***************
*** 694,698 ****
  					if (cls.download != null) {
  						//ZOID, close download
! 						fclose(cls.download);
  						cls.download = null;
  					}
--- 698,704 ----
  					if (cls.download != null) {
  						//ZOID, close download
! 						try {
! 							cls.download.close();
! 						} catch (IOException e) {}
  						cls.download = null;
  					}