added missing time calculation to slopes

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

diff --git a/lib/app/setup.cpp b/lib/app/setup.cpp
index 5ddcb01..20de542 100644 (file)
--- a/lib/app/setup.cpp
+++ b/lib/app/setup.cpp
@@ -17,6 +17,8 @@
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
+#include <config.h>
+
 #include <cassert>
 #include <cstdio>
 #include <iostream>
@@ -41,14 +43,14 @@
 
 #include <cctype>
 
-#include "../app/globals.h"
-#include "../app/setup.h"
-#include "../video/screen.h"
-#include "../video/surface.h"
-#include "../gui/menu.h"
-#include "../utils/configfile.h"
-#include "../audio/sound_manager.h"
-#include "../app/gettext.h"
+#include "globals.h"
+#include "setup.h"
+#include "video/screen.h"
+#include "video/surface.h"
+#include "gui/menu.h"
+#include "utils/configfile.h"
+#include "audio/sound_manager.h"
+#include "gettext.h"
 
 using namespace SuperTux;
 
@@ -90,6 +92,7 @@ int FileSystem::fwriteable(const std::string& filename)
     {
       return false;
     }
+  fclose(fi);
   return true;
 }
 
@@ -249,16 +252,22 @@ std::set<std::string> FileSystem::dfiles(const std::string& rel_path, const  std
   return sdirs;
 }
 
-void Setup::info(const std::string& _package_name, const std::string& _package_symbol_name, const std::string& _package_version)
+void Setup::init(const std::string& _package_name,
+        const std::string& _package_symbol_name,
+        const std::string& _package_version)
 {
-package_name = _package_name;
-package_symbol_name = _package_symbol_name;
-package_version = _package_version;
+  package_name = _package_name;
+  package_symbol_name = _package_symbol_name;    
+  package_version = _package_version;
+    
+  directories();
+  dictionary_manager.add_directory(datadir + "/locale");
+  dictionary_manager.set_charset("iso8859-1");
 }
 
 /* --- SETUP --- */
 /* Set SuperTux configuration and save directories */
-void Setup::directories(void)
+void Setup::directories()
 {
   std::string home;
   /* Get home directory (from $HOME variable)... if we can't determine it,
@@ -284,6 +293,12 @@ void Setup::directories(void)
 
   mkdir((st_dir + "/levels").c_str(), 0755);
 
+  // try current directory as datadir
+  if(datadir.empty()) {
+      if(FileSystem::faccessible("./data/intro.txt"))
+          datadir = "./data";
+  }
+
   // User has not that a datadir, so we try some magic
   if (datadir.empty())
     {
@@ -297,16 +312,21 @@ void Setup::directories(void)
         }
       else
         {
-          std::string exedir = std::string(dirname(exe_file)) + "/";
-          
-          datadir = exedir + "../../data"; // SuperTux run from source dir
+         std::string exedir = std::string(dirname(exe_file)) + "/";
+         
+          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)
+             
+             if (access(datadir.c_str(), F_OK) != 0)
+             {
               datadir = exedir + "../share/" + package_symbol_name; // SuperTux run from PATH
               if (access(datadir.c_str(), F_OK) != 0) 
                 { // If all fails, fall back to compiled path
                   datadir = DATA_PREFIX; 
                 }
+             }
             }
         }
 #else
@@ -740,7 +760,7 @@ void Setup::parseargs(int argc, char * argv[])
       else if (strcmp(argv[i], "--version") == 0)
         {
           /* Show version: */
-          printf((package_name + package_version + "\n").c_str() );
+          printf((package_name + " " + package_version + "\n").c_str() );
           exit(0);
         }
       else if (strcmp(argv[i], "--disable-sound") == 0)