X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fmain.cpp;h=c78e7fbab3ae4d30a8015fb0f45c8edfe402ddbb;hb=bc94afa271ad5b59dc1c3e122f75b0354913edf8;hp=f89805ddc00ae42ff5a11b067d377a7d89905ad5;hpb=ba9907babbb17fadee52f1653f7ad6adf362c6fd;p=supertux.git

diff --git a/src/main.cpp b/src/main.cpp
index f89805ddc..c78e7fbab 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1,7 +1,7 @@
 //  $Id$
-// 
+//
 //  SuperTux
-//  Copyright (C) 2005 Matthias Braun <matze@braunis.de>
+//  Copyright (C) 2006 Matthias Braun <matze@braunis.de>
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
@@ -12,7 +12,7 @@
 //  but WITHOUT ANY WARRANTY; without even the implied warranty of
 //  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 //  GNU General Public License for more details.
-// 
+//
 //  You should have received a copy of the GNU General Public License
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
@@ -20,23 +20,25 @@
 #include <config.h>
 #include <assert.h>
 
+#include "log.hpp"
 #include "main.hpp"
 
 #include <stdexcept>
-#include <iostream>
 #include <sstream>
-#include <time.h>
-#include <stdlib.h>
+#include <ctime>
+#include <cstdlib>
 #include <sys/stat.h>
 #include <sys/types.h>
-#include <dirent.h>
 #include <unistd.h>
-#include <assert.h>
 #include <physfs.h>
 #include <SDL.h>
-#include <SDL_mixer.h>
 #include <SDL_image.h>
-#include <SDL_opengl.h>
+
+#ifdef MACOSX
+namespace supertux_apple {
+#include <CoreFoundation/CoreFoundation.h>
+}
+#endif
 
 #include "gameconfig.hpp"
 #include "resources.hpp"
@@ -44,27 +46,36 @@
 #include "audio/sound_manager.hpp"
 #include "video/surface.hpp"
 #include "video/texture_manager.hpp"
+#include "video/drawing_context.hpp"
+#include "video/glutil.hpp"
 #include "control/joystickkeyboardcontroller.hpp"
-#include "misc.hpp"
+#include "options_menu.hpp"
+#include "mainloop.hpp"
 #include "title.hpp"
 #include "game_session.hpp"
+#include "scripting/level.hpp"
+#include "scripting/squirrel_util.hpp"
 #include "file_system.hpp"
 #include "physfs/physfs_sdl.hpp"
-#include "exceptions.hpp"
+#include "random_generator.hpp"
+#include "worldmap/worldmap.hpp"
+#include "binreloc/binreloc.h"
 
-SDL_Surface* screen = 0;
+namespace { DrawingContext *context_pointer; }
+SDL_Surface *screen;
 JoystickKeyboardController* main_controller = 0;
 TinyGetText::DictionaryManager dictionary_manager;
 
+int SCREEN_WIDTH;
+int SCREEN_HEIGHT;
+
 static void init_config()
 {
   config = new Config();
   try {
     config->load();
   } catch(std::exception& e) {
-#ifdef DEBUG
-    std::cerr << "Couldn't load config file: " << e.what() << "\n";
-#endif
+    log_info << "Couldn't load config file: " << e.what() << ", using default settings" << std::endl;
   }
 }
 
@@ -72,6 +83,11 @@ static void init_tinygettext()
 {
   dictionary_manager.add_directory("locale");
   dictionary_manager.set_charset("UTF-8");
+
+  // Config setting "locale" overrides language detection
+  if (config->locale != "") {
+    dictionary_manager.set_language( config->locale );
+  }
 }
 
 static void init_physfs(const char* argv0)
@@ -84,7 +100,7 @@ static void init_physfs(const char* argv0)
 
   // Initialize physfs (this is a slightly modified version of
   // PHYSFS_setSaneConfig
-  const char* application = PACKAGE_NAME;
+  const char* application = "supertux2"; //instead of PACKAGE_NAME so we can coexist with MS1
   const char* userdir = PHYSFS_getUserDir();
   const char* dirsep = PHYSFS_getDirSeparator();
   char* writedir = new char[strlen(userdir) + strlen(application) + 2];
@@ -97,17 +113,17 @@ static void init_physfs(const char* argv0)
     sprintf(mkdir, ".%s", application);
     if(!PHYSFS_setWriteDir(userdir) || !PHYSFS_mkdir(mkdir)) {
       std::ostringstream msg;
-      msg << "Failed creating configuration directory '" 
+      msg << "Failed creating configuration directory '"
           << writedir << "': " << PHYSFS_getLastError();
       delete[] writedir;
       delete[] mkdir;
       throw std::runtime_error(msg.str());
     }
     delete[] mkdir;
-    
+
     if(!PHYSFS_setWriteDir(writedir)) {
       std::ostringstream msg;
-      msg << "Failed to use configuration directory '" 
+      msg << "Failed to use configuration directory '"
           <<  writedir << "': " << PHYSFS_getLastError();
       delete[] writedir;
       throw std::runtime_error(msg.str());
@@ -134,7 +150,7 @@ static void init_physfs(const char* argv0)
       }
     }
   }
-  
+
   PHYSFS_freeList(rc);
 
   // when started from source dir...
@@ -147,26 +163,63 @@ static void init_physfs(const char* argv0)
   if(f) {
     fclose(f);
     if(!PHYSFS_addToSearchPath(dir.c_str(), 1)) {
-      std::cout << "Warning: Couldn't add '" << dir 
-                << "' to physfs searchpath: " << PHYSFS_getLastError() << "\n";
+      log_warning << "Couldn't add '" << dir << "' to physfs searchpath: " << PHYSFS_getLastError() << std::endl;
+    } else {
+      sourcedir = true;
+    }
+  }
+
+#ifdef MACOSX
+{
+  using namespace supertux_apple;
+
+  // when started from Application file on Mac OS X...
+  char path[PATH_MAX];
+  CFBundleRef mainBundle = CFBundleGetMainBundle();
+  assert(mainBundle != 0);
+  CFURLRef mainBundleURL = CFBundleCopyBundleURL(mainBundle);
+  assert(mainBundleURL != 0);
+  CFStringRef pathStr = CFURLCopyFileSystemPath(mainBundleURL, kCFURLPOSIXPathStyle);
+  assert(pathStr != 0);
+  CFStringGetCString(pathStr, path, PATH_MAX, kCFStringEncodingUTF8);
+  CFRelease(mainBundleURL);
+  CFRelease(pathStr);
+
+  dir = std::string(path) + "/Contents/Resources/data";
+  testfname = dir + "/credits.txt";
+  sourcedir = false;
+  f = fopen(testfname.c_str(), "r");
+  if(f) {
+    fclose(f);
+    if(!PHYSFS_addToSearchPath(dir.c_str(), 1)) {
+      log_warning << "Couldn't add '" << dir << "' to physfs searchpath: " << PHYSFS_getLastError() << std::endl;
     } else {
       sourcedir = true;
     }
   }
+}
+#endif
+
+#ifdef _WIN32
+  PHYSFS_addToSearchPath(".\\data", 1);
+#endif
 
   if(!sourcedir) {
 #if defined(APPDATADIR) || defined(ENABLE_BINRELOC)
     std::string datadir;
 #ifdef ENABLE_BINRELOC
-    char* brdatadir = br_strcat(DATADIR, "/" PACKAGE_NAME);
-    datadir = brdatadir;
-    free(brdatadir);
+
+    char* dir;
+    br_init (NULL);
+    dir = br_find_data_dir(APPDATADIR);
+    datadir = dir;
+    free(dir);
+
 #else
     datadir = APPDATADIR;
 #endif
     if(!PHYSFS_addToSearchPath(datadir.c_str(), 1)) {
-      std::cout << "Couldn't add '" << datadir
-        << "' to physfs searchpath: " << PHYSFS_getLastError() << "\n";
+      log_warning << "Couldn't add '" << datadir << "' to physfs searchpath: " << PHYSFS_getLastError() << std::endl;
     }
 #endif
   }
@@ -175,33 +228,71 @@ static void init_physfs(const char* argv0)
   PHYSFS_permitSymbolicLinks(1);
 
   //show search Path
-  for(char** i = PHYSFS_getSearchPath(); *i != NULL; i++)
-    printf("[%s] is in the search path.\n", *i);
+  char** searchpath = PHYSFS_getSearchPath();
+  for(char** i = searchpath; *i != NULL; i++)
+    log_info << "[" << *i << "] is in the search path" << std::endl;
+  PHYSFS_freeList(searchpath);
 }
 
 static void print_usage(const char* argv0)
 {
-  fprintf(stderr, _("Usage: %s [OPTIONS] LEVELFILE\n\n"), argv0);
+  fprintf(stderr, _("Usage: %s [OPTIONS] [LEVELFILE]\n\n"), argv0);
   fprintf(stderr,
           _("Options:\n"
             "  -f, --fullscreen             Run in fullscreen mode\n"
             "  -w, --window                 Run in window mode\n"
             "  -g, --geometry WIDTHxHEIGHT  Run SuperTux in given resolution\n"
+            "  -a, --aspect WIDTH:HEIGHT    Run SuperTux with given aspect ratio\n"
+            "  -d, --default                Reset video settings to default values\n"
+            "  --disable-sfx                Disable sound effects\n"
+            "  --disable-music              Disable music\n"
             "  --help                       Show this help message\n"
             "  --version                    Display SuperTux version and quit\n"
+            "  --console                    Enable ingame scripting console\n"
+            "  --noconsole                  Disable ingame scripting console\n"
             "  --show-fps                   Display framerate in levels\n"
+            "  --no-show-fps                Do not display framerate in levels\n"
             "  --record-demo FILE LEVEL     Record a demo to FILE\n"
             "  --play-demo FILE LEVEL       Play a recorded demo\n"
             "\n"));
 }
 
-static void parse_commandline(int argc, char** argv)
+/**
+ * Options that should be evaluated prior to any initializations at all go here
+ */
+static bool pre_parse_commandline(int argc, char** argv)
+{
+  for(int i = 1; i < argc; ++i) {
+    std::string arg = argv[i];
+
+    if(arg == "--version") {
+      std::cout << PACKAGE_NAME << " " << PACKAGE_VERSION << std::endl;
+      return true;
+    }
+  }
+
+  return false;
+}
+
+/**
+ * Options that should be evaluated after config is read go here
+ */
+static bool parse_commandline(int argc, char** argv)
 {
   for(int i = 1; i < argc; ++i) {
     std::string arg = argv[i];
 
-    if(arg == "--fullscreen" || arg == "-f") {
+    if(arg == "--help") {
+      print_usage(argv[0]);
+      return true;
+    } else if(arg == "--fullscreen" || arg == "-f") {
       config->use_fullscreen = true;
+    } else if(arg == "--default" || arg == "-d") {
+      config->use_fullscreen = false;
+      config->aspect_width  = -1;
+      config->aspect_height = -1;
+      config->screenwidth = 800;
+      config->screenheight = 600;
     } else if(arg == "--window" || arg == "-w") {
       config->use_fullscreen = false;
     } else if(arg == "--geometry" || arg == "-g") {
@@ -214,8 +305,28 @@ static void parse_commandline(int argc, char** argv)
         print_usage(argv[0]);
         throw std::runtime_error("Invalid geometry spec, should be WIDTHxHEIGHT");
       }
+    } else if(arg == "--aspect" || arg == "-a") {
+      if(i+1 >= argc) {
+        print_usage(argv[0]);
+        throw std::runtime_error("Need to specify a parameter for aspect switch");
+      } else {
+        if(sscanf(argv[++i], "%d:%d", &config->aspect_width, &config->aspect_height) != 2) {
+          print_usage(argv[0]);
+          throw std::runtime_error("Invalid aspect spec, should be WIDTH:HEIGHT");
+        }
+      }
     } else if(arg == "--show-fps") {
       config->show_fps = true;
+    } else if(arg == "--no-show-fps") {
+      config->show_fps = false;
+    } else if(arg == "--console") {
+      config->console_enabled = true;
+    } else if(arg == "--noconsole") {
+      config->console_enabled = false;
+    } else if(arg == "--disable-sfx") {
+      config->sound_enabled = false;
+    } else if(arg == "--disable-music") {
+      config->music_enabled = false;
     } else if(arg == "--play-demo") {
       if(i+1 >= argc) {
         print_usage(argv[0]);
@@ -228,30 +339,28 @@ static void parse_commandline(int argc, char** argv)
         throw std::runtime_error("Need to specify a demo filename");
       }
       config->record_demo = argv[++i];
-    } else if(arg == "--help") {
-      print_usage(argv[0]);
-      throw graceful_shutdown();
-    } else if(arg == "--version") {
-      std::cerr << PACKAGE_NAME << " " << PACKAGE_VERSION << "\n";
-      throw graceful_shutdown();
+    } else if(arg == "-d") {
+      config->enable_script_debugger = true;
     } else if(arg[0] != '-') {
       config->start_level = arg;
     } else {
-      std::cerr << "Unknown option '" << arg << "'.\n";
-      std::cerr << "Use --help to see a list of options.\n";
+      log_warning << "Unknown option '" << arg << "'. Use --help to see a list of options" << std::endl;
+      return true;
     }
   }
 
-  // TODO joystick switchyes...
+  return false;
 }
 
 static void init_sdl()
 {
-  if(SDL_Init(SDL_INIT_EVERYTHING) < 0) {
+  if(SDL_Init(SDL_INIT_TIMER | SDL_INIT_VIDEO | SDL_INIT_JOYSTICK) < 0) {
     std::stringstream msg;
     msg << "Couldn't initialize SDL: " << SDL_GetError();
     throw std::runtime_error(msg.str());
   }
+  // just to be sure
+  atexit(SDL_Quit);
 
   SDL_EnableUNICODE(1);
 
@@ -263,128 +372,88 @@ static void init_sdl()
       ;
 }
 
-static void check_gl_error()
+static void init_rand()
 {
-  GLenum glerror = glGetError();
-  std::string errormsg;
-  
-  if(glerror != GL_NO_ERROR) {
-    switch(glerror) {
-      case GL_INVALID_ENUM:
-        errormsg = "Invalid enumeration value";
-        break;
-      case GL_INVALID_VALUE:
-        errormsg = "Numeric argzment out of range";
-        break;
-      case GL_INVALID_OPERATION:
-        errormsg = "Invalid operation";
-        break;
-      case GL_STACK_OVERFLOW:
-        errormsg = "stack overflow";
-        break;
-      case GL_STACK_UNDERFLOW:
-        errormsg = "stack underflow";
-        break;
-      case GL_OUT_OF_MEMORY:
-        errormsg = "out of memory";
-        break;
-      case GL_TABLE_TOO_LARGE:
-        errormsg = "table too large";
-        break;
-      default:
-        errormsg = "unknown error number";
-        break;
-    }
-    std::stringstream msg;
-    msg << "OpenGL Error: " << errormsg;
-    throw std::runtime_error(msg.str());
-  }
+  config->random_seed = systemRandom.srand(config->random_seed);
+
+  //const char *how = config->random_seed? ", user fixed.": ", from time().";
+  //log_info << "Using random seed " << config->random_seed << how << std::endl;
 }
 
 void init_video()
 {
-  if(texture_manager != NULL)
-    texture_manager->save_textures();
-  
-  SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, 1); 
-  SDL_GL_SetAttribute(SDL_GL_RED_SIZE, 5);
-  SDL_GL_SetAttribute(SDL_GL_GREEN_SIZE, 5);
-  SDL_GL_SetAttribute(SDL_GL_BLUE_SIZE, 5);
+  static int desktop_width = 0;
+  static int desktop_height = 0;
+
+/* unfortunately only newer SDLs have these infos */
+#if SDL_MAJOR_VERSION > 1 || SDL_MINOR_VERSION > 2 || (SDL_MINOR_VERSION == 2 && SDL_PATCHLEVEL >= 10)
+  /* find which resolution the user normally uses */
+  if(desktop_width == 0) {
+    const SDL_VideoInfo *info = SDL_GetVideoInfo();
+    desktop_width  = info->current_w;
+    desktop_height = info->current_h;
+  }
+#endif
   
-  int flags = SDL_OPENGL;
-  if(config->use_fullscreen)
-    flags |= SDL_FULLSCREEN;
-  int width = config->screenwidth;
-  int height = config->screenheight;
-  int bpp = 0;
-
-  screen = SDL_SetVideoMode(width, height, bpp, flags);
-  if(screen == 0) {
-    std::stringstream msg;
-    msg << "Couldn't set video mode (" << width << "x" << height
-        << "-" << bpp << "bpp): " << SDL_GetError();
-    throw std::runtime_error(msg.str());
+  double aspect_ratio = static_cast<double>(config->aspect_width) /
+                               static_cast<double>(config->aspect_height);
+
+  // use aspect ratio to calculate logical resolution
+  if (aspect_ratio > 1) {
+    SCREEN_WIDTH  = static_cast<int> (600 * aspect_ratio + 0.5);
+    SCREEN_HEIGHT = 600;
+  } else {
+    SCREEN_WIDTH  = 600;
+    SCREEN_HEIGHT = static_cast<int> (600 * 1/aspect_ratio + 0.5);
   }
 
+  context_pointer->init_renderer();
+  screen = SDL_GetVideoSurface();
+
   SDL_WM_SetCaption(PACKAGE_NAME " " PACKAGE_VERSION, 0);
 
   // set icon
-  SDL_Surface* icon = IMG_Load_RW(
-      get_physfs_SDLRWops("images/engine/icons/supertux.xpm"), true);
+  #ifdef MACOSX
+  const char* icon_fname = "images/engine/icons/supertux-256x256.png";
+  #else
+  const char* icon_fname = "images/engine/icons/supertux.xpm";
+  #endif
+  SDL_Surface* icon = IMG_Load_RW(get_physfs_SDLRWops(icon_fname), true);
   if(icon != 0) {
     SDL_WM_SetIcon(icon, 0);
     SDL_FreeSurface(icon);
   }
 #ifdef DEBUG
   else {
-    std::cerr << "Warning: Couldn't find icon 'images/engine/icons/supertux.xpm'.\n";
+    log_warning << "Couldn't find icon '" << icon_fname << "'" << std::endl;
   }
 #endif
 
-  // setup opengl state and transform
-  glDisable(GL_DEPTH_TEST);
-  glDisable(GL_CULL_FACE);
-  glEnable(GL_TEXTURE_2D);
-  glEnable(GL_BLEND);
-  glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-
-  glViewport(0, 0, screen->w, screen->h);
-  glMatrixMode(GL_PROJECTION);
-  glLoadIdentity();
-  // logical resolution here not real monitor resolution
-  glOrtho(0, 800, 600, 0, -1.0, 1.0);
-  glMatrixMode(GL_MODELVIEW);
-  glLoadIdentity();
-  glTranslatef(0, 0, 0);
-
-  check_gl_error();
-
-  if(texture_manager != NULL)
-    texture_manager->reload_textures();
-  else
-    texture_manager = new TextureManager();
+  SDL_ShowCursor(0);
+
+  log_info << (config->use_fullscreen?"fullscreen ":"window ") << SCREEN_WIDTH << "x" << SCREEN_HEIGHT << " Ratio: " << aspect_ratio << "\n";
 }
 
 static void init_audio()
 {
   sound_manager = new SoundManager();
-  
+
   sound_manager->enable_sound(config->sound_enabled);
   sound_manager->enable_music(config->music_enabled);
 }
 
 static void quit_audio()
 {
-  if(sound_manager) {
+  if(sound_manager != NULL) {
     delete sound_manager;
-    sound_manager = 0;
+    sound_manager = NULL;
   }
 }
 
 void wait_for_event(float min_delay, float max_delay)
 {
   assert(min_delay <= max_delay);
-  
+
   Uint32 min = (Uint32) (min_delay * 1000);
   Uint32 max = (Uint32) (max_delay * 1000);
 
@@ -394,7 +463,7 @@ void wait_for_event(float min_delay, float max_delay)
     sound_manager->update();
   }
 
-  // clear even queue
+  // clear event queue
   SDL_Event event;
   while (SDL_PollEvent(&event))
   {}
@@ -406,7 +475,8 @@ void wait_for_event(float min_delay, float max_delay)
     while(SDL_PollEvent(&event)) {
       switch(event.type) {
         case SDL_QUIT:
-          throw graceful_shutdown();
+          main_loop->quit();
+          break;
         case SDL_KEYDOWN:
         case SDL_JOYBUTTONDOWN:
         case SDL_MOUSEBUTTONDOWN:
@@ -420,57 +490,128 @@ void wait_for_event(float min_delay, float max_delay)
   }
 }
 
-int main(int argc, char** argv) 
+#ifdef DEBUG
+static Uint32 last_timelog_ticks = 0;
+static const char* last_timelog_component = 0;
+
+static inline void timelog(const char* component)
 {
+  Uint32 current_ticks = SDL_GetTicks();
+
+  if(last_timelog_component != 0) {
+    log_info << "Component '" << last_timelog_component <<  "' finished after " << (current_ticks - last_timelog_ticks) / 1000.0 << " seconds" << std::endl;
+  }
+
+  last_timelog_ticks = current_ticks;
+  last_timelog_component = component;
+}
+#else
+static inline void timelog(const char* )
+{
+}
+#endif
+
+int main(int argc, char** argv)
+{
+  int result = 0;
+
+#ifndef NO_CATCH
   try {
-    srand(time(0));
+#endif
+
+    if(pre_parse_commandline(argc, argv))
+      return 0;
+
+    Console::instance = new Console();
     init_physfs(argv[0]);
     init_sdl();
-    main_controller = new JoystickKeyboardController();    
+
+    timelog("controller");
+    main_controller = new JoystickKeyboardController();
+    timelog("config");
     init_config();
+    timelog("tinygettext");
     init_tinygettext();
-    parse_commandline(argc, argv);
+    timelog("commandline");
+    if(parse_commandline(argc, argv))
+      return 0;
+    timelog("audio");
     init_audio();
+    timelog("video");
+    DrawingContext context;
+    context_pointer = &context;
     init_video();
-
-    setup_menu();
+    Console::instance->init_graphics();
+    timelog("scripting");
+    Scripting::init_squirrel(config->enable_script_debugger);
+    timelog("resources");
     load_shared();
+    timelog(0);
+
+    main_loop = new MainLoop();
     if(config->start_level != "") {
       // we have a normal path specified at commandline not physfs paths.
       // So we simply mount that path here...
       std::string dir = FileSystem::dirname(config->start_level);
       PHYSFS_addToSearchPath(dir.c_str(), true);
-      GameSession session(
-          FileSystem::basename(config->start_level), ST_GL_LOAD_LEVEL_FILE);
-      if(config->start_demo != "")
-        session.play_demo(config->start_demo);
-      if(config->record_demo != "")
-        session.record_demo(config->record_demo);
-      session.run();
+
+      if(config->start_level.size() > 4 &&
+              config->start_level.compare(config->start_level.size() - 5, 5, ".stwm") == 0) {
+          init_rand();
+          main_loop->push_screen(new WorldMapNS::WorldMap(
+                      FileSystem::basename(config->start_level)));
+      } else {
+        init_rand();//If level uses random eg. for
+        // rain particles before we do this:
+        std::auto_ptr<GameSession> session (
+                new GameSession(FileSystem::basename(config->start_level)));
+
+        config->random_seed =session->get_demo_random_seed(config->start_demo);
+        init_rand();//initialise generator with seed from session
+
+        if(config->start_demo != "")
+          session->play_demo(config->start_demo);
+
+        if(config->record_demo != "")
+          session->record_demo(config->record_demo);
+        main_loop->push_screen(session.release());
+      }
     } else {
-      // normal game
-      title();
+      init_rand();
+      main_loop->push_screen(new TitleScreen());
     }
-  } catch(graceful_shutdown& e) {
+
+    //init_rand(); PAK: this call might subsume the above 3, but I'm chicken!
+    main_loop->run(context);
+#ifndef NO_CATCH
   } catch(std::exception& e) {
-    std::cerr << "Unexpected exception: " << e.what() << std::endl;
-    return 1;
+    log_fatal << "Unexpected exception: " << e.what() << std::endl;
+    result = 1;
   } catch(...) {
-    std::cerr << "Unexpected exception." << std::endl;
-    return 1;
+    log_fatal << "Unexpected exception" << std::endl;
+    result = 1;
   }
+#endif
+
+  delete main_loop;
+  main_loop = NULL;
 
-  free_menu();
   unload_shared();
   quit_audio();
 
   if(config)
     config->save();
   delete config;
+  config = NULL;
   delete main_controller;
+  main_controller = NULL;
+  delete Console::instance;
+  Console::instance = NULL;
+  Scripting::exit_squirrel();
   delete texture_manager;
+  texture_manager = NULL;
   SDL_Quit();
   PHYSFS_deinit();
-  
-  return 0;
+
+  return result;
 }