static std::set<std::string> worldmap_list;
-static LevelEditor* leveleditor;
+static FrameRate frame_rate(100);
+
+/* If the demo was stopped - because game started, level
+ editor was excuted, etc - call this when you get back
+ to the title code.
+ */
+void resume_demo()
+{
+ // FIXME: shouldn't be needed if GameSession
+ // didn't relay on global variables
+ titlesession->get_current_sector()->activate();
+ titlesession->set_current();
+
+ frame_rate.update();
+}
void update_load_save_game_menu(Menu* pmenu)
{
std::string map_filename = *it;
+ // some fading
+ fadeout(256);
+ DrawingContext context;
+ context.draw_text(white_text, "Loading...",
+ Vector(screen->w/2, screen->h/2), CENTER_ALLIGN, LAYER_FOREGROUND1);
+ context.do_drawing();
+
worldmap.set_map_filename(map_filename);
// hack to erase the extension
worldmap.display(); // run the map
Menu::set_current(main_menu);
+ resume_demo();
}
else if (index < (int)contrib_subsets.size() + first_level_index)
{
/** get level's title */
std::string level_title = "<no title>";
- LispReader* reader = LispReader::load(subset.get_level_filename(i), "supertux-level");
+ std::string filename = subset.get_level_filename(i);
+ std::string filepath;
+ filepath = st_dir + "/levels/" + filename;
+ if (access(filepath.c_str(), R_OK) != 0)
+ {
+ filepath = datadir + "/levels/" + filename;
+ if (access(filepath.c_str(), R_OK) != 0)
+ {
+ std::cerr << "Error: Level: couldn't find level: " << filename << std::endl;
+ continue;
+ }
+ }
+
+ LispReader* reader = LispReader::load(filepath, "supertux-level");
if(!reader)
{
std::cerr << "Error: Could not open level file. Ignoring...\n";
session.run();
player_status.reset();
Menu::set_current(main_menu);
- titlesession->get_current_sector()->activate();
- titlesession->set_current();
+ resume_demo();
}
}
}
/* --- TITLE SCREEN --- */
void title(void)
{
- random_timer.init(true);
-
walking = true;
+ LevelEditor* leveleditor;
+ random_timer.init(true);
Ticks::pause_init();
- titlesession = new GameSession(datadir + "/levels/misc/menu.stl", ST_GL_DEMO_GAME);
+ titlesession = new GameSession("misc/menu.stl", ST_GL_DEMO_GAME);
/* Load images: */
bkg_title = new Surface(datadir + "/images/background/arctis.jpg", false);
/* --- Main title loop: --- */
frame = 0;
- FrameRate frame_rate(100);
frame_rate.set_frame_limit(false);
random_timer.start(rand() % 2000 + 2000);
leveleditor->run();
delete leveleditor;
Menu::set_current(main_menu);
- frame_rate.update();
+ resume_demo();
break;
case MNID_CREDITS:
+ fadeout(500);
display_text_file("CREDITS", SCROLL_SPEED_CREDITS, white_big_text , white_text, white_small_text, blue_text );
+ fadeout(500);
Menu::set_current(main_menu);
break;
case MNID_QUITMAINMENU:
update_load_save_game_menu(load_game_menu);
Menu::set_current(main_menu);
- frame_rate.update();
+ resume_demo();
}
else if (process_load_game_menu())
{
- // FIXME: shouldn't be needed if GameSession doesn't relay on global variables
- titlesession->get_current_sector()->activate();
- titlesession->set_current();
- //titletux.level_begin();
- frame_rate.update();
+ resume_demo();
}
}
else if(menu == contrib_menu)