#include <config.h>
#include <assert.h>
-#include "main.h"
+#include "main.hpp"
#include <stdexcept>
#include <iostream>
#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 "control/joystickkeyboardcontroller.hpp"
+#include "misc.hpp"
+#include "title.hpp"
+#include "game_session.hpp"
+#include "file_system.hpp"
+#include "physfs/physfs_sdl.hpp"
SDL_Surface* screen = 0;
JoystickKeyboardController* main_controller = 0;
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"
" --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"));
}
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) {