* Fix main.cpp again

[supertux.git] / src / supertux / main.cpp

diff --git a/src/supertux/main.cpp b/src/supertux/main.cpp
index 0913dae..0f6e414 100644 (file)
--- a/src/supertux/main.cpp
+++ b/src/supertux/main.cpp
@@ -14,8 +14,6 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#include "supertux/main.hpp"
-
 #include <config.h>
 #include <version.h>
 
@@ -25,6 +23,8 @@
 #include <binreloc.h>
 #include <tinygettext/log.hpp>
 
+#include "supertux/main.hpp"
+
 #ifdef MACOSX
 namespace supertux_apple {
 #  include <CoreFoundation/CoreFoundation.h>
@@ -568,7 +568,7 @@ Main::main(int argc, char** argv)
     Console::instance->init_graphics();
 
     timelog("scripting");
-    Scripting::init_squirrel(g_config->enable_script_debugger);
+    scripting::init_squirrel(g_config->enable_script_debugger);
 
     timelog("resources");
     Resources::load_shared();
@@ -586,7 +586,7 @@ Main::main(int argc, char** argv)
       if(g_config->start_level.size() > 4 &&
          g_config->start_level.compare(g_config->start_level.size() - 5, 5, ".stwm") == 0) {
         init_rand();
-        g_screen_manager->push_screen(new WorldMapNS::WorldMap(
+        g_screen_manager->push_screen(new worldmap::WorldMap(
                                  FileSystem::basename(g_config->start_level)));
       } else {
         init_rand();//If level uses random eg. for
@@ -633,7 +633,7 @@ Main::main(int argc, char** argv)
   g_main_controller = NULL;
   delete Console::instance;
   Console::instance = NULL;
-  Scripting::exit_squirrel();
+  scripting::exit_squirrel();
   delete texture_manager;
   texture_manager = NULL;
   SDL_Quit();