X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Ftitle.cpp;h=e1501129624d7227591d91ab07385610efcbf159;hb=00fb759c2385ff08caf38e916c2d0ba8cafc8a41;hp=1e913df9808af9ecfabcf4d3c9c86dda7e55f6d6;hpb=0ec5e4e756d691b396f0d8b54d051720fa21ed13;p=supertux.git diff --git a/src/title.cpp b/src/title.cpp index 1e913df98..e15011296 100644 --- a/src/title.cpp +++ b/src/title.cpp @@ -18,8 +18,10 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA // 02111-1307, USA. +#include #include +#include #include #include #include @@ -41,7 +43,7 @@ #include "video/surface.h" #include "high_scores.h" #include "gui/menu.h" -#include "special/timer.h" +#include "timer.h" #include "special/frame_rate.h" #include "app/setup.h" #include "level.h" @@ -55,16 +57,16 @@ #include "sector.h" #include "tilemap.h" #include "resources.h" -#include "special/base.h" #include "app/gettext.h" #include "misc.h" +#include "camera.h" static Surface* bkg_title; static Surface* logo; static Surface* img_choose_subset; static bool walking; -static Timer random_timer; +static Timer2 random_timer; static int frame; @@ -72,10 +74,25 @@ static GameSession* titlesession; static std::vector contrib_subsets; static LevelSubset* current_contrib_subset = 0; +static int first_level_index; static std::set 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) { @@ -101,36 +118,41 @@ void free_contrib_menu() void generate_contrib_menu() { - - /** Generating contrib levels list by making use of Level Subset */ + /** Generating contrib levels list by making use of Level Subset */ std::set level_subsets = FileSystem::dsubdirs("/levels", "info"); free_contrib_menu(); contrib_menu->additem(MN_LABEL,_("Contrib Levels"),0,0); contrib_menu->additem(MN_HL,"",0,0); - int i = 0; - for (std::set::iterator it = level_subsets.begin(); it != level_subsets.end(); ++it) - { - LevelSubset* subset = new LevelSubset(); - subset->load((*it).c_str()); - contrib_menu->additem(MN_GOTO, subset->title.c_str(), i, - contrib_subset_menu); - contrib_subsets.push_back(subset); - ++i; - } - i = 0; for(std::set::iterator it = worldmap_list.begin(); it != worldmap_list.end(); ++it) { WorldMapNS::WorldMap worldmap; worldmap.loadmap((*it).c_str()); - contrib_menu->additem(MN_ACTION, worldmap.get_world_title(),0,0, i + level_subsets.size()); + contrib_menu->additem(MN_ACTION, worldmap.get_world_title(),0,0, i); ++i; } contrib_menu->additem(MN_HL,"",0,0); + + first_level_index = i; + for (std::set::iterator it = level_subsets.begin(); it != level_subsets.end(); ++it) + { + LevelSubset* subset = new LevelSubset(); + subset->load(*it); + if(subset->hide_from_contribs) + { + delete subset; + continue; + } + contrib_menu->additem(MN_GOTO, subset->title, 0, contrib_subset_menu, i); + contrib_subsets.push_back(subset); + ++i; + } + + contrib_menu->additem(MN_HL,"",0,0); contrib_menu->additem(MN_BACK,_("Back"),0,0); level_subsets.clear(); @@ -144,31 +166,76 @@ void check_levels_contrib_menu() if (index == -1) return; - if (index < (int)contrib_subsets.size()) + if((unsigned)index < worldmap_list.size()) + { + WorldMapNS::WorldMap worldmap; + std::set::iterator it = worldmap_list.begin(); + for(int i = index; i > 0; --i) + ++it; + + 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 + unsigned int ext_pos = it->find_last_of("."); + if(ext_pos != std::string::npos) + map_filename.erase(ext_pos, map_filename.size() - ext_pos); + + // TODO: slots should be available for contrib maps + worldmap.loadgame(st_save_dir + "/" + map_filename + "-slot1.stsg"); + + worldmap.display(); // run the map + + Menu::set_current(main_menu); + resume_demo(); + } + else if (index < (int)contrib_subsets.size() + first_level_index) { + index -= first_level_index; if (current_subset != index) { current_subset = index; // FIXME: This shouln't be busy looping LevelSubset& subset = * (contrib_subsets[index]); - + current_contrib_subset = ⊂ contrib_subset_menu->clear(); contrib_subset_menu->additem(MN_LABEL, subset.title, 0,0); contrib_subset_menu->additem(MN_HL,"",0,0); - + for (int i = 0; i < subset.get_num_levels(); ++i) { /** get level's title */ std::string level_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"; - return; + continue; } reader->read_string("name", level_title, true); @@ -184,17 +251,6 @@ void check_levels_contrib_menu() titlesession->set_current(); } } - else if((unsigned)index < worldmap_list.size() + (int)contrib_subsets.size()) - { - WorldMapNS::WorldMap worldmap; - std::set::iterator it = worldmap_list.begin(); - for(int i = index - contrib_subsets.size(); i > 0; --i) - ++it; - worldmap.loadmap((*it)); - worldmap.display(); - - Menu::set_current(main_menu); - } } void check_contrib_subset_menu() @@ -211,50 +267,46 @@ void check_contrib_subset_menu() session.run(); player_status.reset(); Menu::set_current(main_menu); - titlesession->get_current_sector()->activate(); - titlesession->set_current(); + resume_demo(); } } } -void draw_demo(double frame_ratio) +void draw_demo(float elapsed_time) { Sector* world = titlesession->get_current_sector(); Player* tux = world->player; world->play_music(LEVEL_MUSIC); - global_frame_counter++; tux->key_event((SDLKey) keymap.right,DOWN); - if(random_timer.check()) - { + if(random_timer.check()) { + random_timer.start(float(rand() % 3000 + 3000) / 1000.); + walking = !walking; + } else { if(walking) tux->key_event((SDLKey) keymap.jump,UP); else tux->key_event((SDLKey) keymap.jump,DOWN); - } - else - { - random_timer.start(rand() % 3000 + 3000); - walking = !walking; - } + } // Wrap around at the end of the level back to the beginnig - if(world->solids->get_width() * 32 - 320 < tux->base.x) + if(world->solids->get_width() * 32 - 320 < tux->get_pos().x) { tux->level_begin(); + world->camera->reset(tux->get_pos()); } tux->can_jump = true; - float last_tux_x_pos = tux->base.x; - world->action(frame_ratio); + float last_tux_x_pos = tux->get_pos().x; + world->action(elapsed_time); // disabled for now, since with the new jump code we easily get deadlocks // Jump if tux stays in the same position for one loop, ie. if he is // stuck behind a wall - if (last_tux_x_pos == tux->base.x) + if (last_tux_x_pos == tux->get_pos().x) { walking = false; } @@ -265,13 +317,12 @@ void draw_demo(double frame_ratio) /* --- TITLE SCREEN --- */ void title(void) { - random_timer.init(true); - walking = true; + LevelEditor* leveleditor; 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); @@ -279,7 +330,7 @@ void title(void) img_choose_subset = new Surface(datadir + "/images/status/choose-level-subset.png", true); /* Generating contrib maps by only using a string_list */ - worldmap_list = FileSystem::dfiles("levels/worldmap", NULL, "icyisland.stwm"); + worldmap_list = FileSystem::dfiles("levels/worldmap", "", "icyisland.stwm"); titlesession->get_current_sector()->activate(); titlesession->set_current(); @@ -287,25 +338,26 @@ void title(void) /* --- Main title loop: --- */ frame = 0; - FrameRate frame_rate(100); - frame_rate.set_frame_limit(false); - - random_timer.start(rand() % 2000 + 2000); + random_timer.start(float(rand() % 2000 + 2000) / 1000.0); + Uint32 lastticks = SDL_GetTicks(); + Menu::set_current(main_menu); DrawingContext& context = *titlesession->context; while (Menu::current()) { - // if we spent to much time on a menu entry - frame_rate.smooth_hanger(); - // Calculate the movement-factor - double frame_ratio = frame_rate.get(); + Uint32 ticks = SDL_GetTicks(); + float elapsed_time = float(ticks - lastticks) / 1000.; + global_time += elapsed_time; + lastticks = ticks; + // 40fps is minimum + if(elapsed_time > .04) + elapsed_time = .04; - if(frame_ratio > 1.5) /* Quick hack to correct the unprecise CPU clocks a little bit. */ - frame_ratio = 1.5 + (frame_ratio - 1.5) * 0.85; - /* Lower the frame_ratio that Tux doesn't jump to hectically throught the demo. */ - frame_ratio /= 2; + /* Lower the speed so that Tux doesn't jump too hectically throught + the demo. */ + elapsed_time /= 2; SDL_Event event; while (SDL_PollEvent(&event)) @@ -320,19 +372,20 @@ void title(void) } /* Draw the background: */ - draw_demo(frame_ratio); + draw_demo(elapsed_time); if (Menu::current() == main_menu) context.draw_surface(logo, Vector(screen->w/2 - logo->w/2, 30), LAYER_FOREGROUND1+1); - context.draw_text(white_small_text, " SuperTux " VERSION "\n", Vector(0, screen->h - 70), LAYER_FOREGROUND1); + context.draw_text(white_small_text, " SuperTux " PACKAGE_VERSION "\n", + Vector(0, screen->h - 70), 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"), Vector(0, screen->h - 70 + white_small_text->get_height()), LAYER_FOREGROUND1); + "for details.\n"), Vector(0, screen->h - 70 + white_small_text->get_height()), LEFT_ALLIGN, LAYER_FOREGROUND1); /* Don't draw menu, if quit is true */ Menu* menu = Menu::current(); @@ -359,10 +412,12 @@ void title(void) leveleditor->run(); delete leveleditor; Menu::set_current(main_menu); - frame_rate.update(); + resume_demo(); break; case MNID_CREDITS: - display_text_file("CREDITS", SCROLL_SPEED_CREDITS, white_big_text , white_text, white_small_text, blue_text ); + fadeout(500); + display_text_file("credits.txt", SCROLL_SPEED_CREDITS, white_big_text , white_text, white_small_text, blue_text ); + fadeout(500); Menu::set_current(main_menu); break; case MNID_QUITMAINMENU: @@ -379,27 +434,24 @@ void title(void) if(event.key.keysym.sym == SDLK_DELETE) { int slot = menu->get_active_item_id(); - char str[1024]; - sprintf(str,_("Are you sure you want to delete slot %d?"), slot); + std::stringstream stream; + stream << slot; + std::string str = _("Are you sure you want to delete slot") + stream.str() + "?"; - if(confirm_dialog(bkg_title, str)) + if(confirm_dialog(bkg_title, str.c_str())) { - sprintf(str,"%s/slot%d.stsg", st_save_dir, slot); - printf("Removing: %s\n",str); - remove(str); + str = st_save_dir + "/slot" + stream.str() + ".stsg"; + printf("Removing: %s\n",str.c_str()); + remove(str.c_str()); } 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) @@ -420,7 +472,6 @@ void title(void) /* Pause: */ frame++; - SDL_Delay(25); } /* Free surfaces: */