From 3277195739b6b9d32d5133b7c311e7653f6322b0 Mon Sep 17 00:00:00 2001
From: ubeefx <unknown>
Date: Tue, 22 Mar 2011 22:18:43 +0000
Subject: [PATCH] Support for local Magarena data folder.

---
 launch4j/Readme.txt      | 11 ++++++-----
 src/magic/MagicMain.java | 16 ++++++++++++++--
 2 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/launch4j/Readme.txt b/launch4j/Readme.txt
index e3c02a31b7..1e473c991f 100644
--- a/launch4j/Readme.txt
+++ b/launch4j/Readme.txt
@@ -28,17 +28,18 @@ Recommended difficulty level for the best balance of AI speed and strength is th
 
 Have fun!
 
-Release 1.9 (March, 2011)
+Release 1.9 (March 22, 2011)
 ===========
 
-- ubeefx cube (540 cards)
-- singularita cube (860 cards)
+- ubeefx cube (542 cards)
+- singularita cube (862 cards)
 
-- added extra settings to themes
+- when a folder Magarena is present in the same folder as where Magarena is started, that is used as the Magarena data folder
+- added extra settings to themes (see customizing Wiki page)
 - added support for infect keyword and poison counters
 
 - fixed Solemn Offering, it can now target your own permanents with filter legal targets enabled
-- fixed handing of invalid avatars
+- fixed handling of invalid avatars
 
 Release 1.8 (March 13, 2011)
 ===========
diff --git a/src/magic/MagicMain.java b/src/magic/MagicMain.java
index 778c79361f..2c1ed1aed3 100644
--- a/src/magic/MagicMain.java
+++ b/src/magic/MagicMain.java
@@ -18,7 +18,19 @@ public class MagicMain {
 	
 	private static final String GAME_PATH="Magarena";
 	private static final String MODS_PATH="mods";
-		
+
+	private static final String gamePath;
+	
+	static {
+		final File dataDirFile=new File(System.getProperty("user.dir"),GAME_PATH);
+		if (dataDirFile.exists()&&dataDirFile.isDirectory()) {
+			gamePath=dataDirFile.toString();
+		} else {		
+			gamePath=System.getProperty("user.home")+File.separatorChar+GAME_PATH;		
+		}
+		System.out.println("Data folder : "+gamePath);
+	}
+	
 	public static void main(String args[]) {		
 
 		initializeCards();
@@ -27,7 +39,7 @@ public class MagicMain {
 	
 	public static String getGamePath() {
 
-		return System.getProperty("user.home")+File.separatorChar+GAME_PATH;
+		return gamePath;
 	}
 	
 	public static String getModsPath() {