// $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 "audio/sound_manager.hpp"
#include "video/surface.hpp"
#include "video/texture_manager.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 "script_manager.hpp"
-#include "scripting/sound.hpp"
#include "scripting/level.hpp"
-#include "scripting/wrapper_util.hpp"
+#include "scripting/squirrel_util.hpp"
#include "file_system.hpp"
#include "physfs/physfs_sdl.hpp"
+#include "random_generator.hpp"
SDL_Surface* screen = 0;
JoystickKeyboardController* main_controller = 0;
}
}
+#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;
throw std::runtime_error("Need to specify a demo filename");
}
config->record_demo = argv[++i];
+ } else if(arg == "-d") {
+ config->enable_script_debugger = true;
} else if(arg == "--help") {
print_usage(argv[0]);
return true;
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());
;
}
-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());
- }
+ const char *how = config->random_seed? ", user fixed.": ", from time().";
+
+ config->random_seed = systemRandom.srand(config->random_seed);
+
+ log_info << "Using random seed " << config->random_seed << how << std::endl;
}
void init_video()
glLoadIdentity();
glTranslatef(0, 0, 0);
- check_gl_error();
+ check_gl_error("Setting up view matrices");
if(texture_manager != NULL)
texture_manager->reload_textures();
sound_manager->enable_music(config->music_enabled);
}
-static void init_scripting()
-{
- ScriptManager::instance = new ScriptManager();
-
- HSQUIRRELVM vm = ScriptManager::instance->get_vm();
- sq_pushroottable(vm);
- expose_object(vm, -1, new Scripting::Sound(), "Sound", true);
- expose_object(vm, -1, new Scripting::Level(), "Level", true);
- sq_pop(vm, 1);
-}
-
static void quit_audio()
{
if(sound_manager != NULL) {
int result = 0;
try {
- srand(time(0));
+ Console::instance = new Console();
+// srand(time(0)); // this breaks repeatability in random numbers
init_physfs(argv[0]);
init_sdl();
+
timelog("controller");
main_controller = new JoystickKeyboardController();
timelog("config");
init_audio();
timelog("video");
init_video();
- Console::instance = new Console();
+ Console::instance->init_graphics();
timelog("scripting");
- init_scripting();
-
- timelog("menu");
- setup_menu();
+ Scripting::init_squirrel(config->enable_script_debugger);
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);
+
+ init_rand(); // play_demo sets seed, record_demo uses it
+
+ 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 {
+ init_rand();
main_loop->push_screen(new TitleScreen());
}
main_loop->run();
+
} catch(std::exception& e) {
log_fatal << "Unexpected exception: " << e.what() << std::endl;
result = 1;
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;
+ Scripting::exit_squirrel();
delete texture_manager;
texture_manager = NULL;
SDL_Quit();
projects / supertux.git / blobdiff