jake2-commits

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

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

Modified Files:
      Tag: r_0_9
	IN.java Sys.java InputListener.java 
Log Message:
merge changes for 0.9.3

Index: InputListener.java
===================================================================
RCS file: /cvsroot/jake2/jake2/src/jake2/sys/InputListener.java,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.2.1
diff -C2 -d -r1.1.1.1 -r1.1.1.1.2.1
*** InputListener.java	7 Jul 2004 19:59:51 -0000	1.1.1.1
--- InputListener.java	6 Sep 2004 19:39:20 -0000	1.1.1.1.2.1
***************
*** 44,52 ****
  
  	static Jake2InputEvent nextEvent() {
! 		Jake2InputEvent ev = null;
  		synchronized (eventQueue) {
! 			try {
! 				ev = (Jake2InputEvent)eventQueue.removeFirst();
! 			} catch (Exception e) {}
  		}
  		return ev;
--- 44,50 ----
  
  	static Jake2InputEvent nextEvent() {
! 		Jake2InputEvent ev;
  		synchronized (eventQueue) {
! 			ev = (!eventQueue.isEmpty())?(Jake2InputEvent)eventQueue.removeFirst():null;
  		}
  		return ev;

Index: IN.java
===================================================================
RCS file: /cvsroot/jake2/jake2/src/jake2/sys/IN.java,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -d -r1.2 -r1.2.2.1
*** IN.java	8 Jul 2004 15:58:46 -0000	1.2
--- IN.java	6 Sep 2004 19:39:20 -0000	1.2.2.1
***************
*** 91,95 ****
  
  	public static void toggleMouse() {
! 		if (mouse_active) {
  			mouse_avail=false;
  			DeactivateMouse();
--- 91,95 ----
  
  	public static void toggleMouse() {
! 		if (mouse_avail) {
  			mouse_avail=false;
  			DeactivateMouse();

Index: Sys.java
===================================================================
RCS file: /cvsroot/jake2/jake2/src/jake2/sys/Sys.java,v
retrieving revision 1.3.2.1
retrieving revision 1.3.2.2
diff -C2 -d -r1.3.2.1 -r1.3.2.2
*** Sys.java	9 Jul 2004 08:38:25 -0000	1.3.2.1
--- Sys.java	6 Sep 2004 19:39:20 -0000	1.3.2.2
***************
*** 26,42 ****
  package jake2.sys;
  
- import java.io.File;
- import java.io.FilenameFilter;
- import java.util.regex.Pattern;
- import java.util.regex.PatternSyntaxException;
- 
  import jake2.Defines;
  import jake2.Globals;
  import jake2.client.CL;
- import jake2.game.Game;
- import jake2.game.game_export_t;
- import jake2.game.game_import_t;
  import jake2.qcommon.Com;
! import jake2.util.Lib;
  
  /**
--- 26,38 ----
  package jake2.sys;
  
  import jake2.Defines;
  import jake2.Globals;
  import jake2.client.CL;
  import jake2.qcommon.Com;
! 
! import java.io.File;
! import java.io.FilenameFilter;
! import java.util.regex.Pattern;
! import java.util.regex.PatternSyntaxException;
  
  /**
***************
*** 180,184 ****
  			String name = dir.getName();
  
! 			if (Lib.strcmp(name, ".") == 0 || Lib.strcmp(name, "..") == 0)
  				return false;
  
--- 176,180 ----
  			String name = dir.getName();
  
! 			if (name.equals(".") || name.equals(".."))
  				return false;
  
***************
*** 188,200 ****
  	}
  
! 	private static long secbase = 0;
  	public static int Milliseconds() {
! 		if (secbase == 0) {
! 			secbase = System.currentTimeMillis();
! 			return 0;
! 		}
! 		
! 		return Globals.curtime = (int) (System.currentTimeMillis() - secbase);
! 			 
  	}
  
--- 184,190 ----
  	}
  
! 	private static long secbase = System.currentTimeMillis();
  	public static int Milliseconds() {
! 		return Globals.curtime = (int) (System.currentTimeMillis() - secbase);			 
  	}
  
***************
*** 236,247 ****
  
  	}
- 
- 
- 	public static void UnloadGame()
- 	{
- 		//TODO:implement UnloadGame
- 		//Com.Error(Defines.ERR_FATAL, "UnloadGame not implemented!");
- 		
- 	}
  	
  	public static void SendKeyEvents() {
--- 226,229 ----