Merge pull request flareteam#404 from Bertram25/master

Fix for flare-game 160
clintbellanger · Mar 5, 2013 · 38b51f8 · 38b51f8
2 parents 3fdd9c8 + 5ab5a14
commit 38b51f8
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/src/Settings.cpp b/src/Settings.cpp
@@ -264,6 +264,12 @@ void setPaths() {
 		return;
 	}
 
+	// Check for the local data before trying installed ones.
+	if (dirExists("./mods")) {
+		PATH_DATA = "./";
+		return;
+	}
+
 	// check $XDG_DATA_DIRS options
 	// a list of directories in preferred order separated by :
 	if (getenv("XDG_DATA_DIRS") != NULL) {