#include "control/joystickkeyboardcontroller.hpp"
#include "control/codecontroller.hpp"
#include "main.hpp"
+#include "exceptions.hpp"
static Surface* bkg_title;
static Surface* logo;
*/
void resume_demo()
{
- player_status.reset();
+ player_status->reset();
titlesession->get_current_sector()->activate("main");
titlesession->set_current();
GameSession session(
current_contrib_subset->get_level_filename(index), ST_GL_PLAY);
session.run();
- player_status.reset();
+ player_status->reset();
Menu::set_current(main_menu);
resume_demo();
}
titlesession = new GameSession("levels/misc/menu.stl", ST_GL_DEMO_GAME);
/* Load images: */
- bkg_title = new Surface("images/background/arctis.jpg", false);
- logo = new Surface("images/engine/menu/logo.png", true);
- //img_choose_subset = new Surface("images/status/choose-level-subset.png", true);
+ bkg_title = new Surface("images/background/arctis.jpg");
+ logo = new Surface("images/engine/menu/logo.png");
+ //img_choose_subset = new Surface("images/status/choose-level-subset.png");
titlesession->get_current_sector()->activate("main");
titlesession->set_current();
// Calculate the movement-factor
Uint32 ticks = SDL_GetTicks();
float elapsed_time = float(ticks - lastticks) / 1000.;
- global_time += elapsed_time;
+ game_time += elapsed_time;
lastticks = ticks;
// 40fps is minimum
if(elapsed_time > .04)
}
main_controller->process_event(event);
if (event.type == SDL_QUIT)
- throw std::runtime_error("Received window close");
+ throw graceful_shutdown();
}
/* Draw the background: */
draw_demo(elapsed_time);
if (Menu::current() == main_menu)
- context.draw_surface(logo, Vector(SCREEN_WIDTH/2 - logo->w/2, 30),
+ context.draw_surface(logo, Vector(SCREEN_WIDTH/2 - logo->get_width()/2, 30),
LAYER_FOREGROUND1+1);
context.draw_text(white_small_text, " SuperTux " PACKAGE_VERSION "\n",