- Added installation of game data, install required on *nix systems

- Updated desktop file to work better
- Install the desktop file to the standard location
- Install the icon as tmw.png in the standard pixmaps data dir

2 files changed, 3 insertions, 2 deletions

diff --git a/src/resources/itemmanager.cpp b/src/resources/itemmanager.cpp
index 6453b55c..ecccd20c 100644
--- a/src/resources/itemmanager.cpp
+++ b/src/resources/itemmanager.cpp
@@ -40,14 +40,14 @@ ItemManager::ItemManager()
 {
     // Check that file exists before trying to parse it
     std::fstream dbFile;
-    dbFile.open("./data/items.xml", std::ios::in);
+    dbFile.open(TMW_DATADIR "data/items.xml", std::ios::in);
     if (!dbFile.is_open()) {
         logger.log("Cannot find item database!");
         return;
     }
     dbFile.close();
     
-    xmlDocPtr doc = xmlParseFile("./data/items.xml");
+    xmlDocPtr doc = xmlParseFile(TMW_DATADIR "data/items.xml");
 
     if (doc) {
         xmlNodePtr node = xmlDocGetRootElement(doc);
diff --git a/src/resources/resourcemanager.cpp b/src/resources/resourcemanager.cpp
index 8606816e..ba990734 100644
--- a/src/resources/resourcemanager.cpp
+++ b/src/resources/resourcemanager.cpp
@@ -210,6 +210,7 @@ void ResourceManager::deleteInstance()
 void ResourceManager::searchAndAddZipFiles()
 {
     // Add the main data directory to our PhysicsFS search path
+    PHYSFS_addToSearchPath(TMW_DATADIR "data", 1);
     PHYSFS_addToSearchPath("data", 1);
 
     // Define the path in which to search