new editor image for infoblock

[supertux.git] / lib / app / setup.cpp

diff --git a/lib/app/setup.cpp b/lib/app/setup.cpp
index d8c10af..c7972c4 100644 (file)
--- a/lib/app/setup.cpp
+++ b/lib/app/setup.cpp
@@ -252,6 +252,15 @@ std::set<std::string> FileSystem::dfiles(const std::string& rel_path, const  std
   return sdirs;
 }
 
+std::string FileSystem::dirname(const std::string& filename)
+{
+  std::string::size_type p = filename.find_last_of('/');
+  if(p == std::string::npos)                              
+    return "";
+  
+  return filename.substr(0, p+1);
+}
+
 void Setup::init(const std::string& _package_name,
         const std::string& _package_symbol_name,
         const std::string& _package_version)
@@ -294,7 +303,7 @@ void Setup::directories()
 
   // try current directory as datadir
   if(datadir.empty()) {
-      if(FileSystem::faccessible("./data/intro.txt"))
+     if(FileSystem::faccessible("./data/credits.txt"))
           datadir = "./data/";
   }
 
@@ -313,10 +322,10 @@ void Setup::directories()
         {
          std::string exedir = std::string(dirname(exe_file)) + "/";
          
-          datadir = exedir + "../data/"; // SuperTux run from source dir
+          datadir = exedir + "./data/"; // SuperTux run from source dir
           if (access(datadir.c_str(), F_OK) != 0)
             {
-             datadir = exedir + "../../data/";  //SuperTux run from source dir (with libtool script)
+             datadir = exedir + "../../../../data/";  //SuperTux run from source dir (with libtool script)
              
              if (access(datadir.c_str(), F_OK) != 0)
              {