[Jake2-commits] jake2/src/jake2/client CL.java,1.21,1.22 Key.java,1.10,1.11 CL_input.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-serv19653/src/jake2/client

Modified Files:
	CL.java Key.java CL_input.java 
Log Message:
replace Integer.parseInt() to prevent exceptions

Index: Key.java
===================================================================
RCS file: /cvsroot/jake2/jake2/src/jake2/client/Key.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** Key.java	7 Jun 2005 08:43:11 -0000	1.10
--- Key.java	7 Jun 2005 12:57:21 -0000	1.11
***************
*** 288,292 ****
  	 * Called by the system between frames for both key up and key down events.
  	 */
! 	public static void Event(int key, boolean down, long time) {		
  		String kb;
  		String cmd;
--- 288,292 ----
  	 * Called by the system between frames for both key up and key down events.
  	 */
! 	public static void Event(int key, boolean down, int time) {		
  		String kb;
  		String cmd;

Index: CL.java
===================================================================
RCS file: /cvsroot/jake2/jake2/src/jake2/client/CL.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** CL.java	14 May 2005 10:10:44 -0000	1.21
--- CL.java	7 Jun 2005 12:57:21 -0000	1.22
***************
*** 852,856 ****
          // challenge from the server we are connecting to
          if (c.equals("challenge")) {
!             Globals.cls.challenge = Integer.parseInt(Cmd.Argv(1));
              SendConnectPacket();
              return;
--- 852,856 ----
          // challenge from the server we are connecting to
          if (c.equals("challenge")) {
!             Globals.cls.challenge = Lib.atoi(Cmd.Argv(1));
              SendConnectPacket();
              return;

Index: CL_input.java
===================================================================
RCS file: /cvsroot/jake2/jake2/src/jake2/client/CL_input.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** CL_input.java	21 Jan 2005 01:10:09 -0000	1.5
--- CL_input.java	7 Jun 2005 12:57:21 -0000	1.6
***************
*** 33,36 ****
--- 33,37 ----
  import jake2.qcommon.*;
  import jake2.sys.IN;
+ import jake2.util.Lib;
  import jake2.util.Math3D;
  
***************
*** 110,114 ****
  		c = Cmd.Argv(1);
  		if (c.length() > 0)
! 			k = Integer.parseInt(c);
  		else
  			k = -1; // typed manually at the console for continuous down
--- 111,115 ----
  		c = Cmd.Argv(1);
  		if (c.length() > 0)
! 			k = Lib.atoi(c);
  		else
  			k = -1; // typed manually at the console for continuous down
***************
*** 131,135 ****
  		// save timestamp
  		c = Cmd.Argv(2);
! 		b.downtime = Long.parseLong(c);
  		if (b.downtime == 0)
  			b.downtime = Globals.sys_frame_time - 100;
--- 132,136 ----
  		// save timestamp
  		c = Cmd.Argv(2);
! 		b.downtime = Lib.atoi(c);
  		if (b.downtime == 0)
  			b.downtime = Globals.sys_frame_time - 100;
***************
*** 145,149 ****
  		c = Cmd.Argv(1);
  		if (c.length() > 0)
! 			k = Integer.parseInt(c);
  		else {
  			// typed manually at the console, assume for unsticking, so clear
--- 146,150 ----
  		c = Cmd.Argv(1);
  		if (c.length() > 0)
! 			k = Lib.atoi(c);
  		else {
  			// typed manually at the console, assume for unsticking, so clear
***************
*** 299,303 ****
  
  	static void IN_Impulse() {
! 		in_impulse = Integer.parseInt(Cmd.Argv(1));
  	}
  
--- 300,304 ----
  
  	static void IN_Impulse() {
! 		in_impulse = Lib.atoi(Cmd.Argv(1));
  	}