From fa844f29dddfd48a3af5d3a2c8134f5cec68cba0 Mon Sep 17 00:00:00 2001
From: fgenesis <false.genesis@googlemail.com>
Date: Mon, 7 Nov 2011 20:23:54 +0100
Subject: [PATCH] Use mods root dir for the files that were in data/ subdir
 before. Little correction for my prev. patches for compatibility with the
 iPad version.

---
 Aquaria/Continuity.cpp    | 2 +-
 Aquaria/StringBank.cpp    | 2 +-
 Aquaria/WorldMapTiles.cpp | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Aquaria/Continuity.cpp b/Aquaria/Continuity.cpp
index 0a35471..d0da1c1 100644
--- a/Aquaria/Continuity.cpp
+++ b/Aquaria/Continuity.cpp
@@ -3227,7 +3227,7 @@ void Continuity::reset()
 	if(dsq->mod.isActive())
 	{
 		//load mod ingredients
-		loadIngredientData(dsq->mod.getPath() + "data/ingredients.txt");
+		loadIngredientData(dsq->mod.getPath() + "ingredients.txt");
 	}
 
 	//load ingredients for the main game
diff --git a/Aquaria/StringBank.cpp b/Aquaria/StringBank.cpp
index f408304..f979e3d 100644
--- a/Aquaria/StringBank.cpp
+++ b/Aquaria/StringBank.cpp
@@ -30,7 +30,7 @@ void StringBank::load()
 
     _load("data/stringbank.txt");
     if (dsq->mod.isActive())
-        _load(dsq->mod.getPath() + "data/stringbank.txt");
+        _load(dsq->mod.getPath() + "stringbank.txt");
 }
 
 void StringBank::_load(const std::string &file)
diff --git a/Aquaria/WorldMapTiles.cpp b/Aquaria/WorldMapTiles.cpp
index ea9d6b2..04929ab 100644
--- a/Aquaria/WorldMapTiles.cpp
+++ b/Aquaria/WorldMapTiles.cpp
@@ -245,7 +245,7 @@ void WorldMap::load()
     if (!dsq->mod.isActive())
         _load("data/worldmap.txt");
     else
-        _load(dsq->mod.getPath() + "data/worldmap.txt");
+        _load(dsq->mod.getPath() + "worldmap.txt");
 }
 
 void WorldMap::_load(const std::string &file)
@@ -272,7 +272,7 @@ void WorldMap::save()
     std::string fn;
 
     if (dsq->mod.isActive())
-        fn = dsq->mod.getPath() + "data/worldmap.txt";
+        fn = dsq->mod.getPath() + "worldmap.txt";
     else
         fn = "data/worldmap.txt";