remove timer hack and use new Timer classes

4 files changed, 8 insertions, 12 deletions

diff --git a/src/jake2/sys/JOGLKBD.java b/src/jake2/sys/JOGLKBD.java
index 5f08133..59b3361 100644
--- a/src/jake2/sys/JOGLKBD.java
+++ b/src/jake2/sys/JOGLKBD.java
@@ -209,7 +209,7 @@ final public class JOGLKBD extends KBD
 	}	
 		
 	public void Do_Key_Event(int key, boolean down) {
-		Key.Event(key, down, Sys.Milliseconds());
+		Key.Event(key, down, Timer.Milliseconds());
 	}
 	
 	public void centerMouse() {
diff --git a/src/jake2/sys/LWJGLKBD.java b/src/jake2/sys/LWJGLKBD.java
index cdcfcca..071a212 100644
--- a/src/jake2/sys/LWJGLKBD.java
+++ b/src/jake2/sys/LWJGLKBD.java
@@ -35,7 +35,7 @@ public class LWJGLKBD extends KBD {
 			
 			mouseHasTwoButtons = (Mouse.getButtonCount() == 2);
 			
-			lastRepeat = Sys.Milliseconds();
+			lastRepeat = Timer.Milliseconds();
 		} catch (Exception e) {;}	
 	}
 
@@ -207,7 +207,7 @@ public class LWJGLKBD extends KBD {
 	}	
 		
 	public void Do_Key_Event(int key, boolean down) {
-		Key.Event(key, down, Sys.Milliseconds());
+		Key.Event(key, down, Timer.Milliseconds());
 	}
 	
 	public void installGrabs()
diff --git a/src/jake2/sys/Sys.java b/src/jake2/sys/Sys.java
index aeb30fc..498750a 100644
--- a/src/jake2/sys/Sys.java
+++ b/src/jake2/sys/Sys.java
@@ -2,7 +2,7 @@
  * Sys.java
  * Copyright (C) 2003
  * 
- * $Id: Sys.java,v 1.10 2004-12-14 00:11:01 hzi Exp $
+ * $Id: Sys.java,v 1.11 2005-07-01 14:20:54 hzi Exp $
  */
 /*
  Copyright (C) 1997-2001 Id Software, Inc.
@@ -181,11 +181,6 @@ public final class Sys extends Defines {
 
     }
 
-    private static long secbase = System.currentTimeMillis();
-
-    public static int Milliseconds() {
-        return Globals.curtime = (int) (System.currentTimeMillis() - secbase);
-    }
 
     //============================================
 
@@ -230,7 +225,7 @@ public final class Sys extends Defines {
 		Globals.re.getKeyboardHandler().Update();
 
         // grab frame time
-        Globals.sys_frame_time = Sys.Milliseconds();
+        Globals.sys_frame_time = Timer.Milliseconds();
     }
 
     public static String GetClipboardData() {
diff --git a/src/jake2/sys/Timer.java b/src/jake2/sys/Timer.java
index 4eede1f..683e6b6 100644
--- a/src/jake2/sys/Timer.java
+++ b/src/jake2/sys/Timer.java
@@ -2,11 +2,12 @@
  * Timer.java
  * Copyright (C) 2005
  * 
- * $Id: Timer.java,v 1.1 2005-07-01 14:11:01 hzi Exp $
+ * $Id: Timer.java,v 1.2 2005-07-01 14:20:54 hzi Exp $
  */
 package jake2.sys;
 
 import jake2.Globals;
+import jake2.qcommon.Com;
 
 
 public abstract class Timer {
@@ -26,7 +27,7 @@ public abstract class Timer {
 				t = new StandardTimer();
 			}
 		}
-		System.out.println("using " + t.getClass().getName());
+		Com.Println("using " + t.getClass().getName());
 	}
 	
 	public static int Milliseconds() {