#include "audio/sound_manager.hpp"
#include "video/surface.hpp"
#include "video/texture_manager.hpp"
+#include "video/glutil.hpp"
#include "control/joystickkeyboardcontroller.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"
+#include "worldmap/worldmap.hpp"
SDL_Surface* screen = 0;
JoystickKeyboardController* main_controller = 0;
// 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];
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());
}
}
}
-
+
PHYSFS_freeList(rc);
// when started from source dir...
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 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;
-#ifdef GL_TABLE_TOO_LARGE
- case GL_TABLE_TOO_LARGE:
- errormsg = "table too large";
- break;
-#endif
- 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()
{
if(texture_manager != NULL)
texture_manager->save_textures();
-
- SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, 1);
+
+ 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);
-
+
int flags = SDL_OPENGL;
if(config->use_fullscreen)
flags |= SDL_FULLSCREEN;
glLoadIdentity();
glTranslatef(0, 0, 0);
- check_gl_error();
+ check_gl_error("Setting up view matrices");
if(texture_manager != NULL)
texture_manager->reload_textures();
static void init_audio()
{
sound_manager = new SoundManager();
-
+
sound_manager->enable_sound(config->sound_enabled);
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) {
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);
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;
}
}
#endif
-int main(int argc, char** argv)
+int main(int argc, char** argv)
{
int result = 0;
-
+
try {
- srand(time(0));
+ Console::instance = new Console();
init_physfs(argv[0]);
init_sdl();
-
- log_fatal << "Test" << std::endl;
-
+
timelog("controller");
- main_controller = new JoystickKeyboardController();
+ main_controller = new JoystickKeyboardController();
timelog("config");
init_config();
timelog("tinygettext");
init_audio();
timelog("video");
init_video();
- Console::instance = new Console();
+ Console::instance->init_graphics();
timelog("scripting");
- init_scripting();
-
+ Scripting::init_squirrel(config->enable_script_debugger);
timelog("resources");
- load_shared();
+ load_shared();
timelog(0);
- main_loop = new MainLoop();
+ 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);
- 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.release());
+
+ 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 {
+ init_rand();
main_loop->push_screen(new TitleScreen());
}
+ //init_rand(); PAK: this call might subsume the above 3, but I'm chicken!
main_loop->run();
+
} catch(std::exception& e) {
log_fatal << "Unexpected exception: " << e.what() << std::endl;
result = 1;
main_controller = NULL;
delete Console::instance;
Console::instance = NULL;
- delete ScriptManager::instance;
- ScriptManager::instance = NULL;
+ Scripting::exit_squirrel();
delete texture_manager;
texture_manager = NULL;
SDL_Quit();
PHYSFS_deinit();
-
+
return result;
}
projects / supertux.git / blobdiff