// $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 "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"
}
}
+#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)
std::string datadir;
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;
timelog("scripting");
init_scripting();
- timelog("menu");
- setup_menu();
timelog("resources");
load_shared();
timelog(0);
// 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());
}
delete main_loop;
main_loop = NULL;
- free_menu();
- delete ScriptManager::instance;
- ScriptManager::instance = NULL;
+ free_options_menu();
unload_shared();
quit_audio();
main_controller = NULL;
delete Console::instance;
Console::instance = NULL;
+ delete ScriptManager::instance;
+ ScriptManager::instance = NULL;
delete texture_manager;
texture_manager = NULL;
SDL_Quit();