[Jake2-commits] jake2/src/jake2/qcommon FS.java,1.4,1.5

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

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

Modified Files:
	FS.java 
Log Message:
- use $HOME/.jake2 as first searchpath element
- "cddir" as persistent location for baseq2

Index: FS.java
===================================================================
RCS file: /cvsroot/jake2/jake2/src/jake2/qcommon/FS.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** FS.java	20 Aug 2004 21:29:58 -0000	1.4
--- FS.java	18 Sep 2004 12:35:52 -0000	1.5
***************
*** 72,75 ****
--- 72,76 ----
  
  	public static String fs_gamedir;
+ 	private static String fs_userdir;
  	public static cvar_t fs_basedir;
  	public static cvar_t fs_cddir;
***************
*** 483,491 ****
  		//
  		// add the directory to the search path
! 		//
  		search = new searchpath_t();
  		search.filename = new String(dir);
! 		search.next = fs_searchpaths;
! 		fs_searchpaths = search;
  
  		//
--- 484,496 ----
  		//
  		// add the directory to the search path
! 		// ensure fs_userdir is first in searchpath
  		search = new searchpath_t();
  		search.filename = new String(dir);
! 		if (fs_searchpaths != null) {
! 			search.next = fs_searchpaths.next;
! 			fs_searchpaths.next = search;
! 		} else {
! 			fs_searchpaths = search;
! 		}
  
  		//
***************
*** 517,521 ****
  	*/
  	public static String Gamedir() {
! 		return (fs_gamedir != null) ? fs_gamedir : Globals.BASEDIRNAME;
  	}
  
--- 522,526 ----
  	*/
  	public static String Gamedir() {
! 		return (fs_userdir != null) ? fs_userdir : Globals.BASEDIRNAME;
  	}
  
***************
*** 785,788 ****
--- 790,797 ----
  		});
  
+ 		fs_userdir = System.getProperty("user.home") + "/.jake2";
+ 		FS.CreatePath(fs_userdir + "/");
+ 		FS.AddGameDirectory(fs_userdir);
+ 
  		//
  		// basedir <path>
***************
*** 797,804 ****
  		//
  
! 		// TODO zur zeit wird auf baseq2 mit ../../ zugegriffen, sonst ""
! 		fs_cddir = Cvar.Get("cddir", "../..", CVAR_NOSET);
! 		if (fs_cddir.string.length() > 0)
! 			AddGameDirectory(fs_cddir.string + '/' + Globals.BASEDIRNAME);
  
  		//
--- 806,810 ----
  		//
  
! 		setCDDir();
  
  		//
***************
*** 817,820 ****
--- 823,835 ----
  	}
  
+ 	/**
+ 	 * set baseq2 directory
+ 	 */
+ 	static void setCDDir() {
+ 		fs_cddir = Cvar.Get("cddir", "../../baseq2", CVAR_ARCHIVE);
+ 		if (fs_cddir.string.length() > 0)
+ 			AddGameDirectory(fs_cddir.string);		
+ 	}
+ 	
  	//	RAFAEL
  	/*