X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Ftitle.cpp;h=dd720b2842e09402c63da7903139b2ab58b9493e;hb=6ed1900da4edf7d7922f7a4626f95a83e34dff82;hp=d0c391a6403c2bf78c2df2ebe47e99bbda11cf35;hpb=e79c912c4cc8f6fa7eae67254c5f35adc1357460;p=supertux.git diff --git a/src/title.cpp b/src/title.cpp index d0c391a64..dd720b284 100644 --- a/src/title.cpp +++ b/src/title.cpp @@ -25,6 +25,7 @@ #include #include #include +#include #include #include @@ -34,22 +35,28 @@ #endif #include "defines.h" -#include "globals.h" +#include "app/globals.h" #include "title.h" -#include "screen.h" +#include "video/screen.h" +#include "video/surface.h" #include "high_scores.h" -#include "menu.h" -#include "texture.h" -#include "timer.h" -#include "setup.h" +#include "gui/menu.h" +#include "special/timer.h" +#include "app/setup.h" #include "level.h" +#include "level_subset.h" #include "gameloop.h" +#include "worldmap.h" #include "leveleditor.h" #include "scene.h" #include "player.h" -#include "math.h" #include "tile.h" +#include "sector.h" +#include "tilemap.h" #include "resources.h" +#include "special/base.h" +#include "app/gettext.h" +#include "misc.h" static Surface* bkg_title; static Surface* logo; @@ -62,8 +69,26 @@ static int frame; static unsigned int last_update_time; static unsigned int update_time; -std::vector contrib_subsets; -std::string current_contrib_subset; +static GameSession* titlesession; + +static std::vector contrib_subsets; +static LevelSubset* current_contrib_subset = 0; + +static std::set worldmap_list; + +static LevelEditor* leveleditor; + +void update_load_save_game_menu(Menu* pmenu) +{ + for(int i = 2; i < 7; ++i) + { + // FIXME: Insert a real savegame struct/class here instead of + // doing string vodoo + std::string tmp = slotinfo(i - 1); + pmenu->item[i].kind = MN_ACTION; + pmenu->item[i].change_text(tmp.c_str()); + } +} void free_contrib_menu() { @@ -77,66 +102,99 @@ void free_contrib_menu() void generate_contrib_menu() { - string_list_type level_subsets = dsubdirs("/levels", "info"); + + /** 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_LABEL,_("Contrib Levels"),0,0); contrib_menu->additem(MN_HL,"",0,0); - - for (int i = 0; i < level_subsets.num_items; ++i) + + int i = 0; + for (std::set::iterator it = level_subsets.begin(); it != level_subsets.end(); ++it) { LevelSubset* subset = new LevelSubset(); - subset->load(level_subsets.item[i]); + subset->load((*it).c_str()); contrib_menu->additem(MN_GOTO, subset->title.c_str(), i, - contrib_subset_menu, i+1); + 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()); + ++i; } contrib_menu->additem(MN_HL,"",0,0); - contrib_menu->additem(MN_BACK,"Back",0,0); + contrib_menu->additem(MN_BACK,_("Back"),0,0); - string_list_free(&level_subsets); + level_subsets.clear(); } -void check_contrib_menu() +void check_levels_contrib_menu() { static int current_subset = -1; int index = contrib_menu->check(); - if (index != -1) + if (index == -1) + return; + + if (index < (int)contrib_subsets.size()) { - index -= 1; - if (index >= 0 && index <= int(contrib_subsets.size())) - { - if (current_subset != index) - { - current_subset = index; - // FIXME: This shouln't be busy looping - LevelSubset& subset = * (contrib_subsets[index]); + if (current_subset != index) + { + current_subset = index; + // FIXME: This shouln't be busy looping + LevelSubset& subset = * (contrib_subsets[index]); - current_contrib_subset = subset.name; + current_contrib_subset = ⊂ - std::cout << "Updating the contrib subset menu..." << subset.levels << std::endl; - - contrib_subset_menu->clear(); + 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 = 1; i <= subset.levels; ++i) - { - Level level; - level.load(subset.name, i); - contrib_subset_menu->additem(MN_ACTION, level.name, 0, 0, i); - } - contrib_subset_menu->additem(MN_HL,"",0,0); - contrib_subset_menu->additem(MN_BACK, "Back", 0, 0); - } - } - else + 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) { - // Back button + /** get level's title */ + std::string level_title = ""; + + LispReader* reader = LispReader::load(subset.get_level_filename(i), "supertux-level"); + if(!reader) + { + std::cerr << "Error: Could not open level file. Ignoring...\n"; + return; + } + + reader->read_string("name", level_title, true); + delete reader; + + contrib_subset_menu->additem(MN_ACTION, level_title, 0, 0, i); } + + contrib_subset_menu->additem(MN_HL,"",0,0); + contrib_subset_menu->additem(MN_BACK, _("Back"), 0, 0); + + titlesession->get_current_sector()->activate(); + 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); } } @@ -147,56 +205,26 @@ void check_contrib_subset_menu() { if (contrib_subset_menu->get_item_by_id(index).kind == MN_ACTION) { - std::cout << "Sarting level: " << index << std::endl; - GameSession session(current_contrib_subset, index, ST_GL_PLAY); + std::cout << "Starting level: " << index << std::endl; + + GameSession session( + current_contrib_subset->get_level_filename(index), ST_GL_PLAY); session.run(); player_status.reset(); Menu::set_current(main_menu); + titlesession->get_current_sector()->activate(); + titlesession->set_current(); } } } -void draw_background() -{ - /* Draw the title background: */ - - bkg_title->draw_bg(); -} - -void draw_demo(GameSession* session, double frame_ratio) +void draw_demo(double frame_ratio) { - World* world = session->get_world(); - World::set_current(world); - Level* plevel = session->get_level(); - Player* tux = world->get_tux(); + Sector* world = titlesession->get_current_sector(); + Player* tux = world->player; world->play_music(LEVEL_MUSIC); - /* FIXME: - // update particle systems - std::vector::iterator p; - for(p = particle_systems.begin(); p != particle_systems.end(); ++p) - { - (*p)->simulate(frame_ratio); - } - - // Draw particle systems (background) - for(p = particle_systems.begin(); p != particle_systems.end(); ++p) - { - (*p)->draw(scroll_x, 0, 0); - } - */ - - // Draw interactive tiles: -/* for (int y = 0; y < 15; ++y) - { - for (int x = 0; x < 21; ++x) - { - Tile::draw(32*x - fmodf(scroll_x, 32), y * 32, - plevel->ia_tiles[(int)y][(int)x + (int)(scroll_x / 32)]); - } - }*/ - global_frame_counter++; tux->key_event((SDLKey) keymap.right,DOWN); @@ -214,10 +242,9 @@ void draw_demo(GameSession* session, double frame_ratio) } // Wrap around at the end of the level back to the beginnig - if(plevel->width * 32 - 320 < tux->base.x) + if(world->solids->get_width() * 32 - 320 < tux->base.x) { - tux->base.x = tux->base.x - (plevel->width * 32 - 640); - scroll_x = tux->base.x - 320; + tux->level_begin(); } tux->can_jump = true; @@ -233,7 +260,7 @@ void draw_demo(GameSession* session, double frame_ratio) walking = false; } - world->draw(); + world->draw(*titlesession->context); } /* --- TITLE SCREEN --- */ @@ -243,33 +270,34 @@ void title(void) walking = true; - st_pause_ticks_init(); + Ticks::pause_init(); - GameSession session(datadir + "/levels/misc/menu.stl", 0, ST_GL_DEMO_GAME); - - clearscreen(0, 0, 0); - updatescreen(); + titlesession = new GameSession(datadir + "/levels/misc/menu.stl", ST_GL_DEMO_GAME); /* Load images: */ - bkg_title = new Surface(datadir + "/images/title/background.jpg", IGNORE_ALPHA); - logo = new Surface(datadir + "/images/title/logo.png", USE_ALPHA); - img_choose_subset = new Surface(datadir + "/images/status/choose-level-subset.png", USE_ALPHA); + bkg_title = new Surface(datadir + "/images/background/arctis.jpg", false); + logo = new Surface(datadir + "/images/title/logo.png", true); + 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"); + + titlesession->get_current_sector()->activate(); + titlesession->set_current(); /* --- Main title loop: --- */ frame = 0; - /* Draw the title background: */ - bkg_title->draw_bg(); - - update_time = st_get_ticks(); + update_time = Ticks::get(); random_timer.start(rand() % 2000 + 2000); Menu::set_current(main_menu); + DrawingContext& context = *titlesession->context; while (Menu::current()) { // if we spent to much time on a menu entry if( (update_time - last_update_time) > 1000) - update_time = last_update_time = st_get_ticks(); + update_time = last_update_time = Ticks::get(); // Calculate the movement-factor double frame_ratio = ((double)(update_time-last_update_time))/((double)FRAME_RATE); @@ -289,28 +317,29 @@ void title(void) if (event.type == SDL_QUIT) Menu::set_current(0); } - + /* Draw the background: */ - draw_background(); - draw_demo(&session, frame_ratio); + draw_demo(frame_ratio); + if (Menu::current() == main_menu) - logo->draw( 160, 30); + context.draw_surface(logo, Vector(screen->w/2 - logo->w/2, 30), + LAYER_FOREGROUND1+1); - white_small_text->draw(" SuperTux " VERSION "\n" - "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", - 0, 420, 0); + context.draw_text(white_small_text, " SuperTux " VERSION "\n", Vector(0, screen->h - 70), 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); /* Don't draw menu, if quit is true */ Menu* menu = Menu::current(); if(menu) { - menu->draw(); + menu->draw(context); menu->action(); - + if(menu == main_menu) { switch (main_menu->check()) @@ -319,17 +348,20 @@ void title(void) // Start Game, ie. goto the slots menu update_load_save_game_menu(load_game_menu); break; - case MNID_CONTRIB: + case MNID_LEVELS_CONTRIB: // Contrib Menu puts("Entering contrib menu"); generate_contrib_menu(); break; case MNID_LEVELEDITOR: - leveleditor(1); + leveleditor = new LevelEditor(); + leveleditor->run(); + delete leveleditor; Menu::set_current(main_menu); + update_time = Ticks::get(); break; case MNID_CREDITS: - display_text_file("CREDITS", bkg_title, SCROLL_SPEED_CREDITS); + display_text_file("CREDITS", SCROLL_SPEED_CREDITS, white_big_text , white_text, white_small_text, blue_text ); Menu::set_current(main_menu); break; case MNID_QUITMAINMENU: @@ -347,11 +379,9 @@ void title(void) { int slot = menu->get_active_item_id(); char str[1024]; - sprintf(str,"Are you sure you want to delete slot %d?", slot); + sprintf(str,_("Are you sure you want to delete slot %d?"), slot); - draw_background(); - - if(confirm_dialog(str)) + if(confirm_dialog(bkg_title, str)) { sprintf(str,"%s/slot%d.stsg", st_save_dir, slot); printf("Removing: %s\n",str); @@ -359,20 +389,21 @@ void title(void) } update_load_save_game_menu(load_game_menu); - update_time = st_get_ticks(); + Menu::set_current(main_menu); + update_time = Ticks::get(); } else if (process_load_game_menu()) { // FIXME: shouldn't be needed if GameSession doesn't relay on global variables - // reset tux - scroll_x = 0; + titlesession->get_current_sector()->activate(); + titlesession->set_current(); //titletux.level_begin(); - update_time = st_get_ticks(); + update_time = Ticks::get(); } } else if(menu == contrib_menu) { - check_contrib_menu(); + check_levels_contrib_menu(); } else if (menu == contrib_subset_menu) { @@ -380,13 +411,13 @@ void title(void) } } - mouse_cursor->draw(); - - flipscreen(); + mouse_cursor->draw(context); + + context.do_drawing(); /* Set the time of the last update and the time of the current update */ last_update_time = update_time; - update_time = st_get_ticks(); + update_time = Ticks::get(); /* Pause: */ frame++; @@ -395,10 +426,13 @@ void title(void) /* Free surfaces: */ free_contrib_menu(); + worldmap_list.clear(); + delete titlesession; delete bkg_title; delete logo; delete img_choose_subset; } + // EOF //