#include <config.h>
#include <assert.h>
+#include "msg.hpp"
#include "main.hpp"
#include <stdexcept>
-#include <iostream>
#include <sstream>
#include <time.h>
#include <stdlib.h>
#include <assert.h>
#include <physfs.h>
#include <SDL.h>
-#include <SDL_mixer.h>
#include <SDL_image.h>
#include <SDL_opengl.h>
#include "video/texture_manager.hpp"
#include "control/joystickkeyboardcontroller.hpp"
#include "misc.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 "file_system.hpp"
#include "physfs/physfs_sdl.hpp"
-#include "exceptions.hpp"
SDL_Surface* screen = 0;
JoystickKeyboardController* main_controller = 0;
try {
config->load();
} catch(std::exception& e) {
- std::cerr << "Couldn't load config file: " << e.what() << "\n";
- std::cerr << "Using default settings.\n";
+ msg_info << "Couldn't load config file: " << e.what() << ", using default settings" << std::endl;
}
}
if(f) {
fclose(f);
if(!PHYSFS_addToSearchPath(dir.c_str(), 1)) {
- std::cout << "Warning: Couldn't add '" << dir
- << "' to physfs searchpath: " << PHYSFS_getLastError() << "\n";
+ msg_warning << "Couldn't add '" << dir << "' to physfs searchpath: " << PHYSFS_getLastError() << std::endl;
} else {
sourcedir = true;
}
datadir = APPDATADIR;
#endif
if(!PHYSFS_addToSearchPath(datadir.c_str(), 1)) {
- std::cout << "Couldn't add '" << datadir
- << "' to physfs searchpath: " << PHYSFS_getLastError() << "\n";
+ msg_warning << "Couldn't add '" << datadir << "' to physfs searchpath: " << PHYSFS_getLastError() << std::endl;
}
#endif
}
//show search Path
for(char** i = PHYSFS_getSearchPath(); *i != NULL; i++)
- printf("[%s] is in the search path.\n", *i);
+ msg_info << "[" << *i << "] is in the search path" << std::endl;
}
static void print_usage(const char* argv0)
"\n"));
}
-static void parse_commandline(int argc, char** argv)
+static bool parse_commandline(int argc, char** argv)
{
for(int i = 1; i < argc; ++i) {
std::string arg = argv[i];
config->record_demo = argv[++i];
} else if(arg == "--help") {
print_usage(argv[0]);
- throw graceful_shutdown();
+ return true;
} else if(arg == "--version") {
- std::cerr << PACKAGE_NAME << " " << PACKAGE_VERSION << "\n";
- throw graceful_shutdown();
+ msg_info << PACKAGE_NAME << " " << PACKAGE_VERSION << std::endl;
+ return 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";
+ msg_warning << "Unknown option '" << arg << "'. Use --help to see a list of options" << std::endl;
}
}
- // TODO joystick switchyes...
+ return false;
}
static void init_sdl()
}
#ifdef DEBUG
else {
- std::cerr << "Warning: Couldn't find icon 'images/engine/icons/supertux.xpm'.\n";
+ msg_warning << "Couldn't find icon 'images/engine/icons/supertux.xpm'" << std::endl;
}
#endif
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) {
+ if(sound_manager != NULL) {
delete sound_manager;
- sound_manager = 0;
+ sound_manager = NULL;
}
}
sound_manager->update();
}
- // clear even queue
+ // clear event queue
SDL_Event event;
while (SDL_PollEvent(&event))
{}
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:
}
}
+#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) {
+ msg_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)
{
try {
srand(time(0));
init_physfs(argv[0]);
init_sdl();
+ 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");
init_video();
+ timelog("scripting");
+ init_scripting();
+ timelog("menu");
setup_menu();
+ 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(
+ GameSession* session
+ = new GameSession(
FileSystem::basename(config->start_level), ST_GL_LOAD_LEVEL_FILE);
if(config->start_demo != "")
- session.play_demo(config->start_demo);
+ session->play_demo(config->start_demo);
if(config->record_demo != "")
- session.record_demo(config->record_demo);
- session.run();
+ session->record_demo(config->record_demo);
+ main_loop->push_screen(session);
} else {
- // normal game
- title();
+ main_loop->push_screen(new TitleScreen());
}
- } catch(graceful_shutdown& e) {
+
+ main_loop->run();
+
+ delete main_loop;
+ main_loop = NULL;
} catch(std::exception& e) {
- std::cerr << "Unexpected exception: " << e.what() << std::endl;
+ msg_fatal << "Unexpected exception: " << e.what() << std::endl;
return 1;
} catch(...) {
- std::cerr << "Unexpected exception." << std::endl;
+ msg_fatal << "Unexpected exception" << std::endl;
return 1;
}
free_menu();
+ delete ScriptManager::instance;
+ ScriptManager::instance = NULL;
unload_shared();
quit_audio();
if(config)
config->save();
delete config;
+ config = NULL;
delete main_controller;
+ main_controller = NULL;
delete texture_manager;
+ texture_manager = NULL;
SDL_Quit();
PHYSFS_deinit();
projects / supertux.git / blobdiff