- Fixed a bug in the filesystem that broke "+set game".

- cddir no longer requires baseq2 at the end of the value.
- Updated README to reflect above change and to correct the credits.
- The shell scripts now actually accept parameters.

doc/README

@@ -39,7 +39,7 @@ need to move your baseq2/ to that folder. However, you can change this by
 modifying the "cddir" cvar in your config.cfg. For example, if I wanted to
 host my data in ~/.quake2, I would add the following to my config.cfg:
 
-set cddir "/home/flibitijibibo/.quake2/baseq2"
+set cddir "/home/flibitijibibo/.quake2"
 
 Be sure to check for "set cddir" first! LWJake2 adds this in the default config.
 
@@ -47,12 +47,15 @@ Credits
 =======
 
 Bytonic Software - Original Jake2 authors
-------------
+-----------------------------------------
 Holger Zickner <hoz@bytonic.de>
 Carsten Weisse <cwei@bytonic.de>
 Rene Stoeckel  <rst@bytonic.de>
+
+Jake2 Community - Other Jake2 contributors
+------------------------------------------
 David Sanders - Original LWJGL implementation
 
 12characters Games - LWJake2 authors
-----------------
+------------------------------------
 Ethan Lee <flibitijibibo@flibitijibibo.com>

executables/LWJake2.sh

@@ -1,4 +1,4 @@
 #!/bin/bash
 cd `dirname $0`
 export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:./
-java -jar lwjake2.jar
+java -jar lwjake2.jar $@

executables/LWJake2_Server.sh

@@ -1,3 +1,3 @@
 #!/bin/bash
 cd `dirname $0`
-java -jar lwjake2.jar +set dedicated 1
+java -jar lwjake2.jar +set dedicated 1 $@

src/lwjake2/qcommon/FS.java

@@ -925,10 +925,7 @@ public final class FS extends Globals {
         markBaseSearchPaths();
 
         // check for game override
-        fs_gamedirvar = Cvar.Get("game", "", CVAR_LATCH | CVAR_SERVERINFO);
-
-        if (fs_gamedirvar.string.length() > 0)
-            SetGamedir(fs_gamedirvar.string);
+        checkOverride();
     }
 
     /**
@@ -937,7 +934,15 @@ public final class FS extends Globals {
     static void setCDDir() {
         fs_cddir = Cvar.Get("cddir", "", CVAR_ARCHIVE);
         if (fs_cddir.string.length() > 0)
-            AddGameDirectory(fs_cddir.string);
+            AddGameDirectory(fs_cddir.string + '/' + Globals.BASEDIRNAME);
+    }
+    
+    /** Check for "+set game" override - Used to properly set gamedir */
+    static void checkOverride() {
+    	fs_gamedirvar = Cvar.Get("game", "", CVAR_LATCH | CVAR_SERVERINFO);
+
+        if (fs_gamedirvar.string.length() > 0)
+            SetGamedir(fs_gamedirvar.string);
     }
     
     static void markBaseSearchPaths() {

src/lwjake2/qcommon/Qcommon.java

@@ -70,10 +70,13 @@ public final class Qcommon extends Globals {
 			
 			FS.InitFilesystem();
 
+			System.out.println(FS.fs_gamedir);
+			
 			reconfigure(false);
 
 			FS.setCDDir(); // use cddir from config.cfg
 			FS.markBaseSearchPaths(); // mark the default search paths
+			FS.checkOverride();
 			
 			reconfigure(true); // reload default.cfg and config.cfg