Improved the display_text_file(): moved to text.cpp and made it more independent.
[supertux.git] / src / setup.cpp
index 60ebc4c..3826f3f 100644 (file)
@@ -55,8 +55,6 @@
 
 #include "player.h"
 
-void display_text_file(char *filename);
-
 #ifdef WIN32
 #define mkdir(dir, mode)    mkdir(dir)
 // on win32 we typically don't want LFS paths
@@ -348,10 +346,10 @@ void st_directory_setup(void)
         {
           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 + "../share/supertux/"; // SuperTux run from PATH
+              datadir = exedir + "../share/supertux"; // SuperTux run from PATH
               if (access(datadir.c_str(), F_OK) != 0) 
                 { // If all fails, fall back to compiled path
                   datadir = DATA_PREFIX; 
@@ -498,7 +496,7 @@ bool process_load_game_menu()
 
       if (access(slotfile, F_OK) != 0)
         {
-          display_text_file("intro.txt");
+          display_text_file("intro.txt", "images/background/arctis2.jpg");
         }
 
       WorldMapNS::WorldMap worldmap;
@@ -880,7 +878,6 @@ void st_abort(const std::string& reason, const std::string& details)
   abort();
 }
 
-
 /* Set Icon (private) */
 
 void seticon(void)