diff options
-rw-r--r-- | src/jake2/client/CL.java | 4 | ||||
-rw-r--r-- | src/jake2/client/CL_input.java | 11 | ||||
-rw-r--r-- | src/jake2/client/Key.java | 4 |
3 files changed, 10 insertions, 9 deletions
diff --git a/src/jake2/client/CL.java b/src/jake2/client/CL.java index fd1c4d0..83a1191 100644 --- a/src/jake2/client/CL.java +++ b/src/jake2/client/CL.java @@ -2,7 +2,7 @@ * CL.java * Copyright (C) 2004 * - * $Id: CL.java,v 1.21 2005-05-14 10:10:44 hzi Exp $ + * $Id: CL.java,v 1.22 2005-06-07 12:57:21 hzi Exp $ */ /* Copyright (C) 1997-2001 Id Software, Inc. @@ -851,7 +851,7 @@ public final class CL { // challenge from the server we are connecting to if (c.equals("challenge")) { - Globals.cls.challenge = Integer.parseInt(Cmd.Argv(1)); + Globals.cls.challenge = Lib.atoi(Cmd.Argv(1)); SendConnectPacket(); return; } diff --git a/src/jake2/client/CL_input.java b/src/jake2/client/CL_input.java index 5c47e61..3e5e4de 100644 --- a/src/jake2/client/CL_input.java +++ b/src/jake2/client/CL_input.java @@ -2,7 +2,7 @@ * java * Copyright (C) 2004 * - * $Id: CL_input.java,v 1.5 2005-01-21 01:10:09 cawe Exp $ + * $Id: CL_input.java,v 1.6 2005-06-07 12:57:21 hzi Exp $ */ /* Copyright (C) 1997-2001 Id Software, Inc. @@ -32,6 +32,7 @@ import jake2.game.cvar_t; import jake2.game.usercmd_t; import jake2.qcommon.*; import jake2.sys.IN; +import jake2.util.Lib; import jake2.util.Math3D; /** @@ -109,7 +110,7 @@ public class CL_input { c = Cmd.Argv(1); if (c.length() > 0) - k = Integer.parseInt(c); + k = Lib.atoi(c); else k = -1; // typed manually at the console for continuous down @@ -130,7 +131,7 @@ public class CL_input { // save timestamp c = Cmd.Argv(2); - b.downtime = Long.parseLong(c); + b.downtime = Lib.atoi(c); if (b.downtime == 0) b.downtime = Globals.sys_frame_time - 100; @@ -144,7 +145,7 @@ public class CL_input { c = Cmd.Argv(1); if (c.length() > 0) - k = Integer.parseInt(c); + k = Lib.atoi(c); else { // typed manually at the console, assume for unsticking, so clear // all @@ -298,7 +299,7 @@ public class CL_input { } static void IN_Impulse() { - in_impulse = Integer.parseInt(Cmd.Argv(1)); + in_impulse = Lib.atoi(Cmd.Argv(1)); } /* diff --git a/src/jake2/client/Key.java b/src/jake2/client/Key.java index 2a0a45f..1787262 100644 --- a/src/jake2/client/Key.java +++ b/src/jake2/client/Key.java @@ -2,7 +2,7 @@ * Key.java * Copyright (C) 2003 * - * $Id: Key.java,v 1.10 2005-06-07 08:43:11 hzi Exp $ + * $Id: Key.java,v 1.11 2005-06-07 12:57:21 hzi Exp $ */ /* Copyright (C) 1997-2001 Id Software, Inc. @@ -287,7 +287,7 @@ public class Key extends Globals { /** * Called by the system between frames for both key up and key down events. */ - public static void Event(int key, boolean down, long time) { + public static void Event(int key, boolean down, int time) { String kb; String cmd; |