X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Ftitle.cpp;h=ac89c3503ea18f3d50962a1d38524335bbf05dc5;hb=aadeec2cf6fc7a7f20d1ca43ac87e972b8e1840e;hp=eaebd124805b8f3fd145f90099e40f7256040f6b;hpb=63d73bc2cd3c356ffcf25af79256fbf2af1dd07c;p=supertux.git diff --git a/src/title.cpp b/src/title.cpp index eaebd1248..ac89c3503 100644 --- a/src/title.cpp +++ b/src/title.cpp @@ -1,14 +1,23 @@ -/* - title.c - - Super Tux - Title Screen - - by Bill Kendrick - bill@newbreedsoftware.com - http://www.newbreedsoftware.com/supertux/ - - April 11, 2000 - March 15, 2004 -*/ +// $Id$ +// +// SuperTux +// Copyright (C) 2000 Bill Kendrick +// Copyright (C) 2004 Tobias Glaesser +// +// This program is free software; you can redistribute it and/or +// modify it under the terms of the GNU General Public License +// as published by the Free Software Foundation; either version 2 +// of the License, or (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// 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 @@ -49,7 +58,7 @@ static Surface* img_choose_subset; static bool walking; static Timer random_timer; -static int frame, i; +static int frame; static unsigned int last_update_time; static unsigned int update_time; @@ -58,33 +67,26 @@ void display_credits(); std::vector contrib_subsets; std::string current_contrib_subset; -void update_contrib_menu() +void generate_contrib_menu() { - // FIXME: Hack to update only once - static bool up_to_date = false; + string_list_type level_subsets = dsubdirs("/levels", "info"); - if (!up_to_date) - { - string_list_type level_subsets = dsubdirs("/levels", "info"); - - contrib_menu->clear(); - contrib_menu->additem(MN_LABEL,"Contrib Levels",0,0); - contrib_menu->additem(MN_HL,"",0,0); + contrib_menu->clear(); + 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) - { - st_subset subset; - subset.load(level_subsets.item[i]); - contrib_menu->additem(MN_GOTO, subset.title.c_str(), i, contrib_subset_menu); - contrib_subsets.push_back(subset); - } + for (int i = 0; i < level_subsets.num_items; ++i) + { + st_subset subset; + subset.load(level_subsets.item[i]); + contrib_menu->additem(MN_GOTO, subset.title.c_str(), i, contrib_subset_menu); + contrib_subsets.push_back(subset); + } - contrib_menu->additem(MN_HL,"",0,0); - contrib_menu->additem(MN_BACK,"Back",0,0); + contrib_menu->additem(MN_HL,"",0,0); + contrib_menu->additem(MN_BACK,"Back",0,0); - string_list_free(&level_subsets); - up_to_date = true; - } + string_list_free(&level_subsets); } void check_contrib_menu() @@ -133,11 +135,15 @@ void check_contrib_subset_menu() int index = contrib_subset_menu->check(); if (index != -1) { - index -= 1; // FIXME: Hack - std::cout << "Sarting level: " << index << std::endl; - GameSession session(current_contrib_subset, index, ST_GL_PLAY); - session.run(); - Menu::set_current(main_menu); + if (contrib_subset_menu->get_item(index).kind == MN_ACTION) + { + index -= 1; // FIXME: Hack + std::cout << "Sarting level: " << index << std::endl; + halt_music(); + GameSession session(current_contrib_subset, index, ST_GL_PLAY); + session.run(); + Menu::set_current(main_menu); + } } } @@ -154,6 +160,8 @@ void draw_demo(GameSession* session, double frame_ratio) //World* world = session->get_world(); Level* plevel = session->get_level(); Player* tux = session->get_world()->get_tux(); + + session->get_world()->play_music(LEVEL_MUSIC); /* FIXME: // update particle systems @@ -181,14 +189,14 @@ void draw_demo(GameSession* session, double frame_ratio) } global_frame_counter++; - tux->key_event(SDLK_RIGHT,DOWN); + tux->key_event((SDLKey) keymap.right,DOWN); if(random_timer.check()) { if(walking) - tux->key_event(SDLK_UP,UP); + tux->key_event((SDLKey) keymap.jump,UP); else - tux->key_event(SDLK_UP,DOWN); + tux->key_event((SDLKey) keymap.jump,DOWN); } else { @@ -260,12 +268,9 @@ void title(void) { Menu::current()->event(event); } - else - { - // FIXME: QUIT signal should be handled more generic, not locally - if (event.type == SDL_QUIT) - Menu::set_current(0); - } + // FIXME: QUIT signal should be handled more generic, not locally + if (event.type == SDL_QUIT) + Menu::set_current(0); } /* Draw the background: */ @@ -283,59 +288,62 @@ void title(void) 0, 420, 0); /* Don't draw menu, if quit is true */ - if(Menu::current()) - { - Menu::current()->action(); - Menu::current()->draw(); - } - - if(Menu::current() == main_menu) + Menu* menu = Menu::current(); + if(menu) { - switch (main_menu->check()) + menu->draw(); + menu->action(); + + if(menu == main_menu) { - case 0: - // Start Game, ie. goto the slots menu - update_load_save_game_menu(load_game_menu); - break; - case 1: - // Contrib Menu - update_contrib_menu(); - break; - case 3: - leveleditor(1); - Menu::set_current(main_menu); - break; - case 4: - display_credits(); - Menu::set_current(main_menu); - break; - case 5: - Menu::set_current(0); - break; + switch (main_menu->check()) + { + case 0: + // Start Game, ie. goto the slots menu + update_load_save_game_menu(load_game_menu); + break; + case 1: + // Contrib Menu + puts("Entering contrib menu"); + generate_contrib_menu(); + break; + case 3: + halt_music(); + leveleditor(1); + Menu::set_current(main_menu); + break; + case 4: + display_credits(); + Menu::set_current(main_menu); + break; + case 6: + Menu::set_current(0); + break; + } } - } - else if(Menu::current() == options_menu) - { - process_options_menu(); - } - else if(Menu::current() == load_game_menu) - { - if (process_load_game_menu()) + else if(menu == options_menu) { - // FIXME: shouldn't be needed if GameSession doesn't relay on global variables - // reset tux - scroll_x = 0; - //titletux.level_begin(); - update_time = st_get_ticks(); + process_options_menu(); + } + else if(menu == load_game_menu) + { + if (process_load_game_menu()) + { + // FIXME: shouldn't be needed if GameSession doesn't relay on global variables + // reset tux + scroll_x = 0; + //titletux.level_begin(); + update_time = st_get_ticks(); + } + } + else if(menu == contrib_menu) + { + check_contrib_menu(); + } + else if (menu == contrib_subset_menu) + { + check_contrib_subset_menu(); } - } - else if(Menu::current() == contrib_menu) - { - check_contrib_menu(); - } - else if (Menu::current() == contrib_subset_menu) - { - check_contrib_subset_menu(); } mouse_cursor->draw(); @@ -349,7 +357,6 @@ void title(void) /* Pause: */ frame++; SDL_Delay(25); - } /* Free surfaces: */ @@ -360,13 +367,14 @@ void title(void) #define MAX_VEL 10 #define SPEED 1 #define SCROLL 60 +#define ITEMS_SPACE 4 void display_credits() { int done; int scroll, speed; + int y; Timer timer; - int n,d; int length; FILE* fi; char temp[1024]; @@ -399,8 +407,6 @@ void display_credits() speed = 2; done = 0; - n = d = 0; - length = names.num_items; SDL_EnableKeyRepeat(SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL); @@ -451,26 +457,33 @@ void display_credits() white_big_text->drawf("- Credits -", 0, screen->h-scroll, A_HMIDDLE, A_TOP, 2); - for(i = 0, n = 0, d = 0; i < length; i++,n++,d++) + y = 0; + for(int i = 0; i < length; i++) { - if(names.item[i] == "") - n--; - else - { - if(names.item[i][0] == ' ') - white_small_text->drawf(names.item[i], 0, 60+screen->h+(n*18)+(d*18)-scroll-10, A_HMIDDLE, A_TOP, 1); - else if(names.item[i][0] == ' ') - white_text->drawf(names.item[i], 0, 60+screen->h+(n*18)+(d*18)-scroll, A_HMIDDLE, A_TOP, 1); - else if(names.item[i+1][0] == '-' || names.item[i][0] == '-') - white_big_text->drawf(names.item[i], 0, 60+screen->h+(n*18)+(d*18)-scroll, A_HMIDDLE, A_TOP, 3); - else - blue_text->drawf(names.item[i], 0, 60+screen->h+(n*18)+(d*18)-scroll, A_HMIDDLE, A_TOP, 1); - } + switch(names.item[i][0]) + { + case ' ': + white_small_text->drawf(names.item[i], 0, 60+screen->h+y-scroll, A_HMIDDLE, A_TOP, 1); + y += white_small_text->h+ITEMS_SPACE; + break; + case ' ': + white_text->drawf(names.item[i], 0, 60+screen->h+y-scroll, A_HMIDDLE, A_TOP, 1); + y += white_text->h+ITEMS_SPACE; + break; + case '-': + white_big_text->drawf(names.item[i], 0, 60+screen->h+y-scroll, A_HMIDDLE, A_TOP, 3); + y += white_big_text->h+ITEMS_SPACE; + break; + default: + blue_text->drawf(names.item[i], 0, 60+screen->h+y-scroll, A_HMIDDLE, A_TOP, 1); + y += blue_text->h+ITEMS_SPACE; + break; + } } flipscreen(); - if(60+screen->h+(n*18)+(d*18)-scroll < 0 && 20+60+screen->h+(n*18)+(d*18)-scroll < 0) + if(60+screen->h+y-scroll < 0 && 20+60+screen->h+y-scroll < 0) done = 1; scroll += speed;