#include <config.h>
#include <assert.h>
-#include "main.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 "gameconfig.h"
-#include "resources.h"
-#include "gettext.h"
-#include "audio/sound_manager.h"
-#include "video/surface.h"
-#include "control/joystickkeyboardcontroller.h"
-#include "misc.h"
-#include "title.h"
-#include "game_session.h"
-#include "file_system.h"
-#include "physfs/physfs_sdl.h"
+#include "gameconfig.hpp"
+#include "resources.hpp"
+#include "gettext.hpp"
+#include "audio/sound_manager.hpp"
+#include "video/surface.hpp"
+#include "video/texture_manager.hpp"
+#include "control/joystickkeyboardcontroller.hpp"
+#include "misc.hpp"
+#include "title.hpp"
+#include "game_session.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) {
-#ifdef DEBUG
- std::cerr << "Couldn't load config file: " << e.what() << "\n";
-#endif
+ msg_info("Couldn't load config file: " << e.what() << ", using default settings");
}
}
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());
} 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());
}
#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");
}
static void print_usage(const char* argv0)
{
- fprintf(stderr, _("Usage: %s [OPTIONS] LEVELFILE\n\n"), argv0);
+ fprintf(stderr, _("Usage: %s [OPTIONS] [LEVELFILE]\n\n"), argv0);
fprintf(stderr,
_("Options:\n"
- " -f, --fullscreen Run in fullscreen mode.\n"
- " -w, --window Run in window mode.\n"
- " -g, --geometry WIDTHxHEIGHT Run SuperTux in give resolution\n"
+ " -f, --fullscreen Run in fullscreen mode\n"
+ " -w, --window Run in window mode\n"
+ " -g, --geometry WIDTHxHEIGHT Run SuperTux in given resolution\n"
+ " --disable-sfx Disable sound effects\n"
+ " --disable-music Disable music\n"
" --help Show this help message\n"
" --version Display SuperTux version and quit\n"
+ " --show-fps Display framerate in levels\n"
+ " --record-demo FILE LEVEL Record a demo to FILE\n"
+ " --play-demo FILE LEVEL Play a recorded demo\n"
"\n"));
}
}
} else if(arg == "--show-fps") {
config->show_fps = true;
+ } else if(arg == "--disable-sfx") {
+ config->sound_enabled = false;
+ } else if(arg == "--disable-music") {
+ config->music_enabled = false;
} else if(arg == "--play-demo") {
if(i+1 >= argc) {
print_usage(argv[0]);
config->record_demo = argv[++i];
} else if(arg == "--help") {
print_usage(argv[0]);
- throw std::runtime_error("");
+ throw graceful_shutdown();
} else if(arg == "--version") {
- std::cerr << PACKAGE_NAME << " " << PACKAGE_VERSION << "\n";
- throw std::runtime_error("");
+ msg_info(PACKAGE_NAME << " " << PACKAGE_VERSION);
+ throw graceful_shutdown();
} 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");
}
}
void init_video()
{
+ if(texture_manager != NULL)
+ texture_manager->save_textures();
+
SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, 1);
SDL_GL_SetAttribute(SDL_GL_RED_SIZE, 5);
SDL_GL_SetAttribute(SDL_GL_GREEN_SIZE, 5);
}
#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'");
}
#endif
// setup opengl state and transform
glDisable(GL_DEPTH_TEST);
glDisable(GL_CULL_FACE);
+ glEnable(GL_TEXTURE_2D);
+ glEnable(GL_BLEND);
+ glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
glViewport(0, 0, screen->w, screen->h);
glMatrixMode(GL_PROJECTION);
check_gl_error();
- Surface::reload_all();
+ if(texture_manager != NULL)
+ texture_manager->reload_textures();
+ else
+ texture_manager = new TextureManager();
}
static void init_audio()
Uint32 min = (Uint32) (min_delay * 1000);
Uint32 max = (Uint32) (max_delay * 1000);
- SDL_Delay(min);
+ Uint32 ticks = SDL_GetTicks();
+ while(SDL_GetTicks() - ticks < min) {
+ SDL_Delay(10);
+ sound_manager->update();
+ }
// clear even queue
SDL_Event event;
/* Handle events: */
bool running = false;
- Uint32 ticks = SDL_GetTicks();
+ ticks = SDL_GetTicks();
while(running) {
while(SDL_PollEvent(&event)) {
switch(event.type) {
case SDL_QUIT:
- throw std::runtime_error("received window close");
+ throw graceful_shutdown();
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");
+ }
+
+ 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();
+ timelog("commandline");
parse_commandline(argc, argv);
+ timelog("audio");
init_audio();
+ timelog("video");
init_video();
+ timelog("menu");
setup_menu();
+ timelog("resources");
load_shared();
+ timelog(0);
if(config->start_level != "") {
// we have a normal path specified at commandline not physfs paths.
// So we simply mount that path here...
} else {
// normal game
title();
- }
+ }
+ } catch(graceful_shutdown& e) {
} catch(std::exception& e) {
- std::cerr << "Unexpected exception: " << e.what() << std::endl;
+ msg_fatal("Unexpected exception: " << e.what());
return 1;
} catch(...) {
- std::cerr << "Unexpected exception." << std::endl;
+ msg_fatal("Unexpected exception");
return 1;
}
free_menu();
unload_shared();
-#ifdef DEBUG
- Surface::debug_check();
-#endif
quit_audio();
if(config)
config->save();
delete config;
delete main_controller;
+ delete texture_manager;
SDL_Quit();
PHYSFS_deinit();
projects / supertux.git / blobdiff