diff options
| author | Carsten Weisse <[email protected]> | 2004-10-28 21:09:11 +0000 |
|---|---|---|
| committer | Carsten Weisse <[email protected]> | 2004-10-28 21:09:11 +0000 |
| commit | 4b12735cd6da971eb89608cdb86750d96f1074b1 (patch) | |
| tree | b3653db5a45e4632d3e93f5d4afa62ee5a9e12fe | |
| parent | 7ae1fefb7e911a16f4bcee487144195a89dba452 (diff) | |
a call to markBaseSearchPaths() is necessary if setCDDir()
is called outside the init sequence;
also string compare bug fixed
| -rw-r--r-- | src/jake2/qcommon/FS.java | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/src/jake2/qcommon/FS.java b/src/jake2/qcommon/FS.java index 434bd97..0e6aa90 100644 --- a/src/jake2/qcommon/FS.java +++ b/src/jake2/qcommon/FS.java @@ -2,7 +2,7 @@ * FS.java * Copyright (C) 2003 * - * $Id: FS.java,v 1.10 2004-10-25 21:57:48 cawe Exp $ + * $Id: FS.java,v 1.11 2004-10-28 21:09:11 cawe Exp $ */ /* Copyright (C) 1997-2001 Id Software, Inc. @@ -715,7 +715,7 @@ public final class FS extends Globals { fs_gamedir = fs_basedir.string + '/' + dir; - if (!dir.equals(Globals.BASEDIRNAME) || (dir.length() == 0)) { + if (dir.equals(Globals.BASEDIRNAME) || (dir.length() == 0)) { Cvar.FullSet("gamedir", "", CVAR_SERVERINFO | CVAR_NOSET); Cvar.FullSet("game", "", CVAR_LATCH | CVAR_SERVERINFO); } else { @@ -921,7 +921,7 @@ public final class FS extends Globals { AddGameDirectory(fs_basedir.string + '/' + Globals.BASEDIRNAME); // any set gamedirs will be freed up to here - fs_base_searchpaths = fs_searchpaths; + markBaseSearchPaths(); // check for game override fs_gamedirvar = Cvar.Get("game", "", CVAR_LATCH | CVAR_SERVERINFO); @@ -938,6 +938,11 @@ public final class FS extends Globals { if (fs_cddir.string.length() > 0) AddGameDirectory(fs_cddir.string); } + + static void markBaseSearchPaths() { + // any set gamedirs will be freed up to here + fs_base_searchpaths = fs_searchpaths; + } // RAFAEL /* |