// $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
// 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
#include <config.h>
#include <assert.h>
-#include "msg.hpp"
+#include "log.hpp"
#include "main.hpp"
#include <stdexcept>
#include "video/surface.hpp"
#include "video/texture_manager.hpp"
#include "control/joystickkeyboardcontroller.hpp"
-#include "misc.hpp"
+#include "options_menu.hpp"
#include "mainloop.hpp"
#include "title.hpp"
#include "game_session.hpp"
try {
config->load();
} catch(std::exception& e) {
- msg_info << "Couldn't load config file: " << e.what() << ", using default settings" << std::endl;
+ log_info << "Couldn't load config file: " << e.what() << ", using default settings" << std::endl;
}
}
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;
+ }
+ }
+
+#ifdef MACOSX
+ // when started from Application file on Mac OS X...
+ dir = PHYSFS_getBaseDir();
+ dir += "SuperTux.app/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)) {
msg_warning << "Couldn't add '" << dir << "' to physfs searchpath: " << PHYSFS_getLastError() << std::endl;
} else {
sourcedir = true;
}
}
+#endif
if(!sourcedir) {
#if defined(APPDATADIR) || defined(ENABLE_BINRELOC)
datadir = APPDATADIR;
#endif
if(!PHYSFS_addToSearchPath(datadir.c_str(), 1)) {
- msg_warning << "Couldn't add '" << datadir << "' to physfs searchpath: " << PHYSFS_getLastError() << std::endl;
+ log_warning << "Couldn't add '" << datadir << "' to physfs searchpath: " << PHYSFS_getLastError() << std::endl;
}
#endif
}
//show search Path
for(char** i = PHYSFS_getSearchPath(); *i != NULL; i++)
- msg_info << "[" << *i << "] is in the search path" << std::endl;
+ log_info << "[" << *i << "] is in the search path" << std::endl;
}
static void print_usage(const char* argv0)
print_usage(argv[0]);
return true;
} else if(arg == "--version") {
- msg_info << PACKAGE_NAME << " " << PACKAGE_VERSION << std::endl;
+ log_info << PACKAGE_NAME << " " << PACKAGE_VERSION << std::endl;
return true;
} else if(arg[0] != '-') {
config->start_level = arg;
} else {
- msg_warning << "Unknown option '" << arg << "'. Use --help to see a list of options" << std::endl;
+ log_warning << "Unknown option '" << arg << "'. Use --help to see a list of options" << std::endl;
}
}
msg << "Couldn't initialize SDL: " << SDL_GetError();
throw std::runtime_error(msg.str());
}
+ // just to be sure
+ atexit(SDL_Quit);
SDL_EnableUNICODE(1);
case GL_OUT_OF_MEMORY:
errormsg = "out of memory";
break;
+#ifdef GL_TABLE_TOO_LARGE
case GL_TABLE_TOO_LARGE:
errormsg = "table too large";
break;
+#endif
default:
errormsg = "unknown error number";
break;
}
#ifdef DEBUG
else {
- msg_warning << "Couldn't find icon 'images/engine/icons/supertux.xpm'" << std::endl;
+ log_warning << "Couldn't find icon 'images/engine/icons/supertux.xpm'" << std::endl;
}
#endif
Uint32 current_ticks = SDL_GetTicks();
if(last_timelog_component != 0) {
- msg_info << "Component '" << last_timelog_component << "' finished after " << (current_ticks - last_timelog_ticks) / 1000.0 << " seconds" << std::endl;
+ log_info << "Component '" << last_timelog_component << "' finished after " << (current_ticks - last_timelog_ticks) / 1000.0 << " seconds" << std::endl;
}
last_timelog_ticks = current_ticks;
int main(int argc, char** argv)
{
+ int result = 0;
+
try {
srand(time(0));
init_physfs(argv[0]);
init_audio();
timelog("video");
init_video();
+ Console::instance = new Console();
timelog("scripting");
init_scripting();
- timelog("menu");
- setup_menu();
timelog("resources");
- load_shared();
+ load_shared();
timelog(0);
main_loop = new MainLoop();
// So we simply mount that path here...
std::string dir = FileSystem::dirname(config->start_level);
PHYSFS_addToSearchPath(dir.c_str(), true);
- GameSession* session
- = new GameSession(
- FileSystem::basename(config->start_level), ST_GL_LOAD_LEVEL_FILE);
+ std::auto_ptr<GameSession> session
+ (new GameSession(FileSystem::basename(config->start_level)));
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);
+ main_loop->push_screen(session.release());
} else {
main_loop->push_screen(new TitleScreen());
}
main_loop->run();
-
- delete main_loop;
- main_loop = NULL;
} catch(std::exception& e) {
- msg_fatal << "Unexpected exception: " << e.what() << std::endl;
- return 1;
+ log_fatal << "Unexpected exception: " << e.what() << std::endl;
+ result = 1;
} catch(...) {
- msg_fatal << "Unexpected exception" << std::endl;
- return 1;
+ log_fatal << "Unexpected exception" << std::endl;
+ result = 1;
}
- free_menu();
- delete ScriptManager::instance;
- ScriptManager::instance = NULL;
+ delete main_loop;
+ main_loop = NULL;
+
+ free_options_menu();
unload_shared();
quit_audio();
config = NULL;
delete main_controller;
main_controller = NULL;
+ delete Console::instance;
+ Console::instance = NULL;
+ delete ScriptManager::instance;
+ ScriptManager::instance = NULL;
delete texture_manager;
texture_manager = NULL;
SDL_Quit();
PHYSFS_deinit();
- return 0;
+ return result;
}