#include "resources.h"
#include "app/gettext.h"
#include "misc.h"
+#include "textscroller.h"
static Surface* bkg_title;
static Surface* logo;
*/
void resume_demo()
{
- // FIXME: shouldn't be needed if GameSession
- // didn't relay on global variables
- titlesession->get_current_sector()->activate();
+ player_status.reset();
+ titlesession->get_current_sector()->activate("main");
titlesession->set_current();
frame_rate.update();
contrib_subset_menu->additem(MN_HL,"",0,0);
contrib_subset_menu->additem(MN_BACK, _("Back"), 0, 0);
- titlesession->get_current_sector()->activate();
+ titlesession->get_current_sector()->activate("main");
titlesession->set_current();
}
}
// Wrap around at the end of the level back to the beginnig
if(world->solids->get_width() * 32 - 320 < tux->get_pos().x)
{
- tux->level_begin();
+ world->activate("main");
world->camera->reset(tux->get_pos());
}
logo = new Surface(datadir + "/images/title/logo.png", true);
img_choose_subset = new Surface(datadir + "/images/status/choose-level-subset.png", true);
- titlesession->get_current_sector()->activate();
+ titlesession->get_current_sector()->activate("main");
titlesession->set_current();
/* --- Main title loop: --- */
LAYER_FOREGROUND1+1);
context.draw_text(white_small_text, " SuperTux " PACKAGE_VERSION "\n",
- Vector(0, screen->h - 70), LEFT_ALLIGN, LAYER_FOREGROUND1);
+ Vector(0, screen->h - 50), LEFT_ALLIGN, LAYER_FOREGROUND1);
context.draw_text(white_small_text,
_(
"Copyright (c) 2003 SuperTux Devel Team\n"
-"This game comes with ABSOLUTELY NO WARRANTY. This is free software, and you\n"
-"are welcome to redistribute it under certain conditions; see the file COPYING\n"
-"for details.\n"
+"This game comes with ABSOLUTELY NO WARRANTY. This is free software, and you are welcome to\n"
+"redistribute it under certain conditions; see the file COPYING for details.\n"
),
- Vector(0, screen->h - 70 + white_small_text->get_height()),
+ Vector(0, screen->h - 50 + white_small_text->get_height() + 5),
LEFT_ALLIGN, LAYER_FOREGROUND1);
/* Don't draw menu, if quit is true */
fadeout(500);
credits_music = SoundManager::get()->load_music(datadir + "/music/credits.ogg");
SoundManager::get()->play_music(credits_music);
- display_text_file("credits.txt", SCROLL_SPEED_CREDITS, white_big_text , white_text, white_small_text, blue_text );
+ display_text_file("credits.txt");
fadeout(500);
Menu::set_current(main_menu);
break;