[Jake2-commits] jake2/src/jake2/client CL.java,1.22,1.23 V.java,1.4,1.5 Menu.java,1.18,1.19 SCR.java,1.14,1.15

[Holger Z. <hz...@us...>]

Update of /cvsroot/jake2/jake2/src/jake2/client
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30655/src/jake2/client

Modified Files:
	CL.java V.java Menu.java SCR.java 
Log Message:
remove timer hack and use new Timer classes

Index: Menu.java
===================================================================
RCS file: /cvsroot/jake2/jake2/src/jake2/client/Menu.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** Menu.java	9 Feb 2005 20:47:30 -0000	1.18
--- Menu.java	1 Jul 2005 14:20:50 -0000	1.19
***************
*** 31,34 ****
--- 31,35 ----
  import jake2.qcommon.*;
  import jake2.sound.S;
+ import jake2.sys.*;
  import jake2.sys.NET;
  import jake2.sys.Sys;
***************
*** 777,781 ****
              re.DrawChar(menu.x, menu.y + menu.cursor * 9, '=');
          else
!             re.DrawChar(menu.x, menu.y + menu.cursor * 9, 12 + ((int) (Sys
                      .Milliseconds() / 250) & 1));
      }
--- 778,782 ----
              re.DrawChar(menu.x, menu.y + menu.cursor * 9, '=');
          else
!             re.DrawChar(menu.x, menu.y + menu.cursor * 9, 12 + ((int) (Timer
                      .Milliseconds() / 250) & 1));
      }
***************
*** 4406,4410 ****
                  offset = f.cursor;
  
!             if ((((int) (Sys.Milliseconds() / 250)) & 1) != 0) {
                  re.DrawChar(f.x + f.parent.x + (offset + 2) * 8 + 8, f.y
                          + f.parent.y, 11);
--- 4407,4411 ----
                  offset = f.cursor;
  
!             if ((((int) (Timer.Milliseconds() / 250)) & 1) != 0) {
                  re.DrawChar(f.x + f.parent.x + (offset + 2) * 8 + 8, f.y
                          + f.parent.y, 11);
***************
*** 4649,4656 ****
              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));
              } else {
                  re.DrawChar(menu.x + item.cursor_offset, menu.y + item.y,
!                         12 + ((int) (Sys.Milliseconds() / 250) & 1));
              }
          }
--- 4650,4657 ----
              if ((item.flags & QMF_LEFT_JUSTIFY) != 0) {
                  re.DrawChar(menu.x + item.x - 24 + item.cursor_offset, menu.y
!                         + item.y, 12 + ((int) (Timer.Milliseconds() / 250) & 1));
              } else {
                  re.DrawChar(menu.x + item.cursor_offset, menu.y + item.y,
!                         12 + ((int) (Timer.Milliseconds() / 250) & 1));
              }
          }

Index: V.java
===================================================================
RCS file: /cvsroot/jake2/jake2/src/jake2/client/V.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** V.java	20 Jan 2005 23:15:23 -0000	1.4
--- V.java	1 Jul 2005 14:20:50 -0000	1.5
***************
*** 30,34 ****
  import jake2.game.cvar_t;
  import jake2.qcommon.*;
! import jake2.sys.Sys;
  import jake2.util.Math3D;
  import jake2.util.Vargs;
--- 30,34 ----
  import jake2.game.cvar_t;
  import jake2.qcommon.*;
! import jake2.sys.Timer;
  import jake2.util.Math3D;
  import jake2.util.Vargs;
***************
*** 284,288 ****
          if (cl_timedemo.value != 0.0f) {
              if (cl.timedemo_start == 0)
!                 cl.timedemo_start = Sys.Milliseconds();
              cl.timedemo_frames++;
          }
--- 284,288 ----
          if (cl_timedemo.value != 0.0f) {
              if (cl.timedemo_start == 0)
!                 cl.timedemo_start = Timer.Milliseconds();
              cl.timedemo_frames++;
          }

Index: SCR.java
===================================================================
RCS file: /cvsroot/jake2/jake2/src/jake2/client/SCR.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** SCR.java	8 Feb 2005 20:33:33 -0000	1.14
--- SCR.java	1 Jul 2005 14:20:52 -0000	1.15
***************
*** 32,37 ****
  import jake2.game.cvar_t;
  import jake2.qcommon.*;
! import jake2.sound.*;
! import jake2.sys.Sys;
  import jake2.util.Lib;
  import jake2.util.Vargs;
--- 32,37 ----
  import jake2.game.cvar_t;
  import jake2.qcommon.*;
! import jake2.sound.S;
! import jake2.sys.Timer;
  import jake2.util.Lib;
  import jake2.util.Vargs;
***************
*** 589,593 ****
  
          UpdateScreen();
!         cls.disable_screen = Sys.Milliseconds();
          cls.disable_servercount = cl.servercount;
      }
--- 589,593 ----
  
          UpdateScreen();
!         cls.disable_screen = Timer.Milliseconds();
          cls.disable_servercount = cl.servercount;
      }
***************
*** 619,623 ****
              return;
  
!         start = Sys.Milliseconds();
  
          if (Cmd.Argc() == 2) { // run without page flipping
--- 619,623 ----
              return;
  
!         start = Timer.Milliseconds();
  
          if (Cmd.Argc() == 2) { // run without page flipping
***************
*** 638,642 ****
          }
  
!         stop = Sys.Milliseconds();
          time = (stop - start) / 1000.0f;
          Com.Printf("%f seconds (%f fps)\n", new Vargs(2).add(time).add(
--- 638,642 ----
          }
  
!         stop = Timer.Milliseconds();
          time = (stop - start) / 1000.0f;
          Com.Printf("%f seconds (%f fps)\n", new Vargs(2).add(time).add(
***************
*** 1179,1183 ****
          // do nothing at all
          if (cls.disable_screen != 0) {
!             if (Sys.Milliseconds() - cls.disable_screen > 120000) {
                  cls.disable_screen = 0;
                  Com.Printf("Loading plaque timed out.\n");
--- 1179,1183 ----
          // do nothing at all
          if (cls.disable_screen != 0) {
!             if (Timer.Milliseconds() - cls.disable_screen > 120000) {
                  cls.disable_screen = 0;
                  Com.Printf("Loading plaque timed out.\n");

Index: CL.java
===================================================================
RCS file: /cvsroot/jake2/jake2/src/jake2/client/CL.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** CL.java	7 Jun 2005 12:57:21 -0000	1.22
--- CL.java	1 Jul 2005 14:20:48 -0000	1.23
***************
*** 733,737 ****
              int time;
  
!             time = (int) (Sys.Milliseconds() - Globals.cl.timedemo_start);
              if (time > 0)
                  Com.Printf("%i frames, %3.1f seconds: %3.1f fps\n",
--- 733,737 ----
              int time;
  
!             time = (int) (Timer.Milliseconds() - Globals.cl.timedemo_start);
              if (time > 0)
                  Com.Printf("%i frames, %3.1f seconds: %3.1f fps\n",
***************
*** 1277,1281 ****
      public static void InitLocal() {
          Globals.cls.state = Defines.ca_disconnected;
!         Globals.cls.realtime = Sys.Milliseconds();
  
          CL_input.InitInput();
--- 1277,1281 ----
      public static void InitLocal() {
          Globals.cls.state = Defines.ca_disconnected;
!         Globals.cls.realtime = Timer.Milliseconds();
  
          CL_input.InitInput();
***************
*** 1543,1547 ****
          // if in the debugger last frame, don't timeout
          if (msec > 5000)
!             Globals.cls.netchan.last_received = Sys.Milliseconds();
  
          // fetch results from server
--- 1543,1547 ----
          // if in the debugger last frame, don't timeout
          if (msec > 5000)
!             Globals.cls.netchan.last_received = Timer.Milliseconds();
  
          // fetch results from server