diff options
| author | Holger Zickner <[email protected]> | 2005-05-26 16:56:33 +0000 |
|---|---|---|
| committer | Holger Zickner <[email protected]> | 2005-05-26 16:56:33 +0000 |
| commit | c96baeae8717b80e23afabd4abdfb5aff0e8cbcc (patch) | |
| tree | 5d0849dc34b79ed36c1f59353ac6ea5ae5361071 /src/jake2/qcommon/FS.java | |
| parent | 152b65e3999ba7a618cdf934c830351f2f76cff2 (diff) | |
merge last changes from 0.9.4 branch
Diffstat (limited to 'src/jake2/qcommon/FS.java')
| -rw-r--r-- | src/jake2/qcommon/FS.java | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/jake2/qcommon/FS.java b/src/jake2/qcommon/FS.java index b4fe7eb..0bea72b 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.13 2005-05-20 15:05:54 cawe Exp $ + * $Id: FS.java,v 1.14 2005-05-26 16:56:32 hzi Exp $ */ /* Copyright (C) 1997-2001 Id Software, Inc. @@ -659,14 +659,11 @@ public final class FS extends Globals { * ExecAutoexec */ public static void ExecAutoexec() { + String dir = fs_userdir; - String dir; String name; - - dir = Cvar.VariableString("gamedir"); - if (dir != null && dir.length() > 0) { - name = fs_basedir.string + '/' + dir + "/autoexec.cfg"; + name = dir + "/autoexec.cfg"; } else { name = fs_basedir.string + '/' + Globals.BASEDIRNAME + "/autoexec.cfg"; |