allow magarena.dir to take precedence over user.dir for determining GAME_PATH

master
melvin 2012-08-02 10:16:25 +08:00
parent 97e5ceb178
commit 474115fb83
1 changed files with 6 additions and 1 deletions

View File

@ -18,7 +18,12 @@ public class MagicMain {
private static final String GAME_FOLDER = "Magarena"; private static final String GAME_FOLDER = "Magarena";
private static final String MODS_PATH = "mods"; private static final String MODS_PATH = "mods";
private static final String SCRIPTS_PATH = "scripts"; private static final String SCRIPTS_PATH = "scripts";
private static final String GAME_PATH = System.getProperty("user.dir")+File.separatorChar+GAME_FOLDER; private static final String GAME_PATH =
(System.getProperty("magarena.dir") != null ?
System.getProperty("magarena.dir") :
System.getProperty("user.dir")) +
File.separatorChar +
GAME_FOLDER;
public static void main(final String args[]) { public static void main(final String args[]) {
// setup the handler for any uncaught exception // setup the handler for any uncaught exception