updated ambient sound for use with flexlay

[supertux.git] / src / main.cpp

diff --git a/src/main.cpp b/src/main.cpp
index 9157784..1ce98bc 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -91,8 +91,8 @@ static void find_directories()
 
   // try current directory as datadir
   if(datadir.empty()) {
-    if(FileSystem::faccessible("./basest/credits.txt")) {
-      datadir = "./basest/";
+    if(FileSystem::faccessible("./data/credits.txt")) {
+      datadir = "./data/";
     }
   }
 
@@ -106,7 +106,7 @@ static void find_directories()
 #endif
     } else {
       std::string exedir = std::string(dirname(exe_file)) + "/";
-      std::string testdir = exedir + "./basest/";
+      std::string testdir = exedir + "./data/";
       if(access(testdir.c_str(), F_OK) == 0) {
         datadir = testdir;
       }
@@ -133,7 +133,7 @@ static void find_directories()
 static void init_tinygettext()
 {
   dictionary_manager.add_directory(datadir + "/locale");
-  dictionary_manager.set_charset("iso8859-1");
+  dictionary_manager.set_charset("UTF-8");
 }
 
 static void print_usage(const char* argv0)