aboutsummaryrefslogtreecommitdiffstats
path: root/src/jake2/client
diff options
context:
space:
mode:
Diffstat (limited to 'src/jake2/client')
-rw-r--r--src/jake2/client/CL.java8
-rw-r--r--src/jake2/client/Menu.java11
-rw-r--r--src/jake2/client/SCR.java14
-rw-r--r--src/jake2/client/V.java6
4 files changed, 20 insertions, 19 deletions
diff --git a/src/jake2/client/CL.java b/src/jake2/client/CL.java
index 83a1191..7266668 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.22 2005-06-07 12:57:21 hzi Exp $
+ * $Id: CL.java,v 1.23 2005-07-01 14:20:48 hzi Exp $
*/
/*
Copyright (C) 1997-2001 Id Software, Inc.
@@ -732,7 +732,7 @@ public final class CL {
if (Globals.cl_timedemo != null && Globals.cl_timedemo.value != 0.0f) {
int time;
- time = (int) (Sys.Milliseconds() - Globals.cl.timedemo_start);
+ time = (int) (Timer.Milliseconds() - Globals.cl.timedemo_start);
if (time > 0)
Com.Printf("%i frames, %3.1f seconds: %3.1f fps\n",
new Vargs(3).add(Globals.cl.timedemo_frames).add(
@@ -1276,7 +1276,7 @@ public final class CL {
*/
public static void InitLocal() {
Globals.cls.state = Defines.ca_disconnected;
- Globals.cls.realtime = Sys.Milliseconds();
+ Globals.cls.realtime = Timer.Milliseconds();
CL_input.InitInput();
@@ -1542,7 +1542,7 @@ public final class CL {
// if in the debugger last frame, don't timeout
if (msec > 5000)
- Globals.cls.netchan.last_received = Sys.Milliseconds();
+ Globals.cls.netchan.last_received = Timer.Milliseconds();
// fetch results from server
ReadPackets();
diff --git a/src/jake2/client/Menu.java b/src/jake2/client/Menu.java
index c6b2923..4e582dd 100644
--- a/src/jake2/client/Menu.java
+++ b/src/jake2/client/Menu.java
@@ -2,7 +2,7 @@
* Menu.java
* Copyright (C) 2004
*
- * $Id: Menu.java,v 1.18 2005-02-09 20:47:30 cawe Exp $
+ * $Id: Menu.java,v 1.19 2005-07-01 14:20:50 hzi Exp $
*/
/*
Copyright (C) 1997-2001 Id Software, Inc.
@@ -30,6 +30,7 @@ import jake2.game.Cmd;
import jake2.game.cvar_t;
import jake2.qcommon.*;
import jake2.sound.S;
+import jake2.sys.*;
import jake2.sys.NET;
import jake2.sys.Sys;
import jake2.util.*;
@@ -776,7 +777,7 @@ public final class Menu extends Key {
if (bind_grab)
re.DrawChar(menu.x, menu.y + menu.cursor * 9, '=');
else
- re.DrawChar(menu.x, menu.y + menu.cursor * 9, 12 + ((int) (Sys
+ re.DrawChar(menu.x, menu.y + menu.cursor * 9, 12 + ((int) (Timer
.Milliseconds() / 250) & 1));
}
@@ -4405,7 +4406,7 @@ public final class Menu extends Key {
else
offset = f.cursor;
- if ((((int) (Sys.Milliseconds() / 250)) & 1) != 0) {
+ if ((((int) (Timer.Milliseconds() / 250)) & 1) != 0) {
re.DrawChar(f.x + f.parent.x + (offset + 2) * 8 + 8, f.y
+ f.parent.y, 11);
} else {
@@ -4648,10 +4649,10 @@ public final class Menu extends Key {
} else if (item != null && item.type != MTYPE_FIELD) {
if ((item.flags & QMF_LEFT_JUSTIFY) != 0) {
re.DrawChar(menu.x + item.x - 24 + item.cursor_offset, menu.y
- + item.y, 12 + ((int) (Sys.Milliseconds() / 250) & 1));
+ + item.y, 12 + ((int) (Timer.Milliseconds() / 250) & 1));
} else {
re.DrawChar(menu.x + item.cursor_offset, menu.y + item.y,
- 12 + ((int) (Sys.Milliseconds() / 250) & 1));
+ 12 + ((int) (Timer.Milliseconds() / 250) & 1));
}
}
diff --git a/src/jake2/client/SCR.java b/src/jake2/client/SCR.java
index df685e7..67aaf3c 100644
--- a/src/jake2/client/SCR.java
+++ b/src/jake2/client/SCR.java
@@ -2,7 +2,7 @@
* SCR.java
* Copyright (C) 2003
*
- * $Id: SCR.java,v 1.14 2005-02-08 20:33:33 cawe Exp $
+ * $Id: SCR.java,v 1.15 2005-07-01 14:20:52 hzi Exp $
*/
/*
Copyright (C) 1997-2001 Id Software, Inc.
@@ -31,8 +31,8 @@ import jake2.Globals;
import jake2.game.Cmd;
import jake2.game.cvar_t;
import jake2.qcommon.*;
-import jake2.sound.*;
-import jake2.sys.Sys;
+import jake2.sound.S;
+import jake2.sys.Timer;
import jake2.util.Lib;
import jake2.util.Vargs;
@@ -588,7 +588,7 @@ public final class SCR extends Globals {
scr_draw_loading = 1;
UpdateScreen();
- cls.disable_screen = Sys.Milliseconds();
+ cls.disable_screen = Timer.Milliseconds();
cls.disable_servercount = cl.servercount;
}
@@ -618,7 +618,7 @@ public final class SCR extends Globals {
if (cls.state != ca_active)
return;
- start = Sys.Milliseconds();
+ start = Timer.Milliseconds();
if (Cmd.Argc() == 2) { // run without page flipping
re.BeginFrame(0);
@@ -637,7 +637,7 @@ public final class SCR extends Globals {
}
}
- stop = Sys.Milliseconds();
+ stop = Timer.Milliseconds();
time = (stop - start) / 1000.0f;
Com.Printf("%f seconds (%f fps)\n", new Vargs(2).add(time).add(
128.0f / time));
@@ -1178,7 +1178,7 @@ public final class SCR extends Globals {
// changing)
// do nothing at all
if (cls.disable_screen != 0) {
- if (Sys.Milliseconds() - cls.disable_screen > 120000) {
+ if (Timer.Milliseconds() - cls.disable_screen > 120000) {
cls.disable_screen = 0;
Com.Printf("Loading plaque timed out.\n");
}
diff --git a/src/jake2/client/V.java b/src/jake2/client/V.java
index 329613c..01eb171 100644
--- a/src/jake2/client/V.java
+++ b/src/jake2/client/V.java
@@ -2,7 +2,7 @@
* V.java
* Copyright (C) 2003
*
- * $Id: V.java,v 1.4 2005-01-20 23:15:23 cawe Exp $
+ * $Id: V.java,v 1.5 2005-07-01 14:20:50 hzi Exp $
*/
/*
Copyright (C) 1997-2001 Id Software, Inc.
@@ -29,7 +29,7 @@ import jake2.Globals;
import jake2.game.Cmd;
import jake2.game.cvar_t;
import jake2.qcommon.*;
-import jake2.sys.Sys;
+import jake2.sys.Timer;
import jake2.util.Math3D;
import jake2.util.Vargs;
@@ -283,7 +283,7 @@ public final class V extends Globals {
if (cl_timedemo.value != 0.0f) {
if (cl.timedemo_start == 0)
- cl.timedemo_start = Sys.Milliseconds();
+ cl.timedemo_start = Timer.Milliseconds();
cl.timedemo_frames++;
}
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-02 02:03:10 +0000