Voomra/lwjake2
0
Fork 0
Code Activity

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

Browse Source 
- 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.
This commit is contained in:
Ethan Lee
2012-02-12 00:45:07 -05:00
parent 7b4507d00d
commit 614b7a38d5
5 changed files with 21 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
doc/README
View File

@@ -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 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: 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. 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 Bytonic Software - Original Jake2 authors
------------ -----------------------------------------
Holger Zickner <hoz@bytonic.de> Holger Zickner <hoz@bytonic.de>
Carsten Weisse <cwei@bytonic.de> Carsten Weisse <cwei@bytonic.de>
Rene Stoeckel <rst@bytonic.de> Rene Stoeckel <rst@bytonic.de>
Jake2 Community - Other Jake2 contributors
------------------------------------------
David Sanders - Original LWJGL implementation David Sanders - Original LWJGL implementation
12characters Games - LWJake2 authors 12characters Games - LWJake2 authors
---------------- ------------------------------------
Ethan Lee <flibitijibibo@flibitijibibo.com> Ethan Lee <flibitijibibo@flibitijibibo.com>

2
executables/LWJake2.sh
View File

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

2
executables/LWJake2_Server.sh
View File

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

15
src/lwjake2/qcommon/FS.java
View File

@@ -925,10 +925,7 @@ public final class FS extends Globals {
markBaseSearchPaths(); markBaseSearchPaths();
// check for game override // check for game override
fs_gamedirvar = Cvar.Get("game", "", CVAR_LATCH | CVAR_SERVERINFO); checkOverride();
if (fs_gamedirvar.string.length() > 0)
SetGamedir(fs_gamedirvar.string);
} }
/** /**
@@ -937,7 +934,15 @@ public final class FS extends Globals {
static void setCDDir() { static void setCDDir() {
fs_cddir = Cvar.Get("cddir", "", CVAR_ARCHIVE); fs_cddir = Cvar.Get("cddir", "", CVAR_ARCHIVE);
if (fs_cddir.string.length() > 0) 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() { static void markBaseSearchPaths() {

3
src/lwjake2/qcommon/Qcommon.java
View File

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