X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Ftitle.cpp;h=730dbf782b4065e36edd11496ba50a913ebfc94c;hb=8e7ccc8e3b34ee1adb6f3cf7c3bc49e07c59fcb0;hp=daf82ffbf66c53e78767dac85c16e8962aea3a72;hpb=c04c4dd3b5a68142f20942ea5221bf738162156e;p=supertux.git diff --git a/src/title.cpp b/src/title.cpp index daf82ffbf..730dbf782 100644 --- a/src/title.cpp +++ b/src/title.cpp @@ -36,20 +36,26 @@ #include "defines.h" #include "globals.h" #include "title.h" -#include "screen.h" +#include "screen/screen.h" +#include "screen/surface.h" #include "high_scores.h" #include "menu.h" -#include "texture.h" #include "timer.h" #include "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 "type.h" +#include "gettext.h" static Surface* bkg_title; static Surface* logo; @@ -62,8 +68,14 @@ 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 string_list_type worldmap_list; + +static LevelEditor* leveleditor; void free_contrib_menu() { @@ -77,11 +89,12 @@ void free_contrib_menu() void generate_contrib_menu() { + /** Generating contrib levels list by making use of Level Subset */ string_list_type level_subsets = 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) @@ -94,12 +107,12 @@ void generate_contrib_menu() } 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); } -void check_contrib_menu() +void check_levels_contrib_menu() { static int current_subset = -1; @@ -115,22 +128,26 @@ void check_contrib_menu() // 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->additem(MN_LABEL, subset.title, 0,0); contrib_subset_menu->additem(MN_HL,"",0,0); - for (int i = 1; i <= subset.levels; ++i) + + for (int i = 0; i < subset.get_num_levels(); ++i) { - Level level; - level.load(subset.name, i); - contrib_subset_menu->additem(MN_ACTION, level.name, 0, 0, i); + Level* level = new Level; + level->load(subset.get_level_filename(i)); + contrib_subset_menu->additem(MN_ACTION, level->get_name(), 0, 0, i); + delete level; } + contrib_subset_menu->additem(MN_HL,"",0,0); - contrib_subset_menu->additem(MN_BACK, "Back", 0, 0); + contrib_subset_menu->additem(MN_BACK, _("Back"), 0, 0); + + titlesession->get_current_sector()->activate(); + titlesession->set_current(); } } else @@ -148,27 +165,35 @@ void check_contrib_subset_menu() if (contrib_subset_menu->get_item_by_id(index).kind == MN_ACTION) { std::cout << "Starting level: " << index << std::endl; - GameSession session(current_contrib_subset, index, ST_GL_PLAY); + + 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() +void check_contrib_worldmap_menu() { - /* Draw the title background: */ + int index = contrib_worldmap_menu->check(); + if (index != -1) + { + WorldMapNS::WorldMap worldmap; + worldmap.loadmap(worldmap_list.item[index]); + worldmap.display(); - bkg_title->draw_bg(); + Menu::set_current(main_menu); + } } -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); @@ -189,10 +214,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->level_begin(); - scroll_x = 0; } tux->can_jump = true; @@ -208,7 +232,7 @@ void draw_demo(GameSession* session, double frame_ratio) walking = false; } - world->draw(); + world->draw(*titlesession->context); } /* --- TITLE SCREEN --- */ @@ -220,26 +244,38 @@ void title(void) st_pause_ticks_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 = dfiles("levels/worldmap", NULL, NULL); + + contrib_worldmap_menu->additem(MN_LABEL, _("Contrib Worlds"), 0,0); + contrib_worldmap_menu->additem(MN_HL, "", 0,0); + for(int i = 0; i < worldmap_list.num_items; i++) + { + WorldMapNS::WorldMap worldmap; + worldmap.loadmap(worldmap_list.item[i]); + contrib_worldmap_menu->additem(MN_ACTION, worldmap.get_world_title(),0,0,i); + } + contrib_worldmap_menu->additem(MN_HL,"",0,0); + contrib_worldmap_menu->additem(MN_BACK,"Back",0,0); + + 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(); 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 @@ -266,23 +302,24 @@ void title(void) } /* Draw the background: */ - draw_demo(&session, frame_ratio); - + draw_demo(frame_ratio); + if (Menu::current() == main_menu) - logo->draw(screen->w/2 - logo->w/2, 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, screen->h - 70, 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) @@ -293,17 +330,22 @@ void title(void) // Start Game, ie. goto the slots menu update_load_save_game_menu(load_game_menu); break; - case MNID_CONTRIB: + case MNID_WORLDMAP_CONTRIB: + break; + case MNID_LEVELS_CONTRIB: // Contrib Menu puts("Entering contrib menu"); generate_contrib_menu(); break; case MNID_LEVELEDITOR: - leveleditor(); + leveleditor = new LevelEditor(); + leveleditor->run(); + delete leveleditor; Menu::set_current(main_menu); + update_time = st_get_ticks(); break; case MNID_CREDITS: - display_text_file("CREDITS", bkg_title, SCROLL_SPEED_CREDITS); + display_text_file("CREDITS", SCROLL_SPEED_CREDITS); Menu::set_current(main_menu); break; case MNID_QUITMAINMENU: @@ -321,11 +363,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); @@ -339,25 +379,29 @@ void title(void) 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(); } } else if(menu == contrib_menu) { - check_contrib_menu(); + check_levels_contrib_menu(); } else if (menu == contrib_subset_menu) { check_contrib_subset_menu(); } + else if(menu == contrib_worldmap_menu) + { + check_contrib_worldmap_menu(); + } } - 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; @@ -370,6 +414,7 @@ void title(void) /* Free surfaces: */ free_contrib_menu(); + delete titlesession; delete bkg_title; delete logo; delete img_choose_subset;