#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;
const std::string& _package_symbol_name,
const std::string& _package_version)
{
- directories();
- dictionary_manager.add_directory(datadir + "/locale");
-
package_name = _package_name;
- package_symbol_name = _package_symbol_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 --- */
st_dir = home + "/." + package_symbol_name;
/* Remove .supertux config-file from old SuperTux versions */
- if(FileSystem::faccessible(st_dir))
- {
- remove(st_dir.c_str());
- }
+ if(FileSystem::faccessible(st_dir)) {
+ remove(st_dir.c_str());
+ }
st_save_dir = st_dir + "/save";
// try current directory as datadir
if(datadir.empty()) {
if(FileSystem::faccessible("./data/intro.txt"))
- datadir = "./data";
+ datadir = "./data/";
}
// User has not that a datadir, so we try some magic
{
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)
{
- datadir = exedir + "../share/" + package_symbol_name; // SuperTux run from PATH
+ 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;
+ datadir = DATA_PREFIX;
+ datadir += "/";
}
}
}
}
#else
- datadir = DATA_PREFIX;
+ datadir = DATA_PREFIX;
+ datadir += "/";
#endif
}
printf("Datadir: %s\n", datadir.c_str());