diff options
| author | Holger Zickner <[email protected]> | 2005-07-01 14:20:56 +0000 |
|---|---|---|
| committer | Holger Zickner <[email protected]> | 2005-07-01 14:20:56 +0000 |
| commit | db84d8bc1c5da2c8e703a1465da36a01cc278935 (patch) | |
| tree | 7e41f45b911c9ffe075f5264679be68aac996b91 /src/jake2/qcommon | |
| parent | 667a27ca1186506757adae0997089f018beac49a (diff) | |
remove timer hack and use new Timer classes
Diffstat (limited to 'src/jake2/qcommon')
| -rw-r--r-- | src/jake2/qcommon/Netchan.java | 6 | ||||
| -rw-r--r-- | src/jake2/qcommon/Qcommon.java | 9 |
2 files changed, 8 insertions, 7 deletions
diff --git a/src/jake2/qcommon/Netchan.java b/src/jake2/qcommon/Netchan.java index 9f594ef..202a499 100644 --- a/src/jake2/qcommon/Netchan.java +++ b/src/jake2/qcommon/Netchan.java @@ -2,7 +2,7 @@ * NetChannel.java * Copyright (C) 2003 * - * $Id: Netchan.java,v 1.5 2005-01-17 21:55:45 cawe Exp $ + * $Id: Netchan.java,v 1.6 2005-07-01 14:20:56 hzi Exp $ */ /* Copyright (C) 1997-2001 Id Software, Inc. @@ -30,7 +30,7 @@ import jake2.Globals; import jake2.game.cvar_t; import jake2.server.SV_MAIN; import jake2.sys.NET; -import jake2.sys.Sys; +import jake2.sys.Timer; /** * Netchan @@ -111,7 +111,7 @@ public final class Netchan extends SV_MAIN { long port; // pick a port value that should be nice and random - port = Sys.Milliseconds() & 0xffff; + port = Timer.Milliseconds() & 0xffff; showpackets = Cvar.Get("showpackets", "0", 0); showdrop = Cvar.Get("showdrop", "0", 0); diff --git a/src/jake2/qcommon/Qcommon.java b/src/jake2/qcommon/Qcommon.java index 9041a04..9ff8177 100644 --- a/src/jake2/qcommon/Qcommon.java +++ b/src/jake2/qcommon/Qcommon.java @@ -2,7 +2,7 @@ * Qcommon.java * Copyright 2003 * - * $Id: Qcommon.java,v 1.18 2005-06-28 08:41:19 hzi Exp $ + * $Id: Qcommon.java,v 1.19 2005-07-01 14:20:56 hzi Exp $ */ /* Copyright (C) 1997-2001 Id Software, Inc. @@ -30,6 +30,7 @@ import jake2.Jake2; import jake2.client.*; import jake2.game.Cmd; import jake2.server.SV_MAIN; +import jake2.sys.*; import jake2.sys.NET; import jake2.sys.Sys; import jake2.util.Vargs; @@ -212,19 +213,19 @@ public final class Qcommon extends Globals { int time_after= 0; if (Globals.host_speeds.value != 0.0f) - time_before= Sys.Milliseconds(); + time_before= Timer.Milliseconds(); Com.debugContext = "SV:"; SV_MAIN.SV_Frame(msec); if (Globals.host_speeds.value != 0.0f) - time_between= Sys.Milliseconds(); + time_between= Timer.Milliseconds(); Com.debugContext = "CL:"; CL.Frame(msec); if (Globals.host_speeds.value != 0.0f) { - time_after= Sys.Milliseconds(); + time_after= Timer.Milliseconds(); int all= time_after - time_before; int sv= time_between - time_before; |