X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Ftitle.cpp;h=01dacb0b6aed59090f6f263f408563307ce8f132;hb=9e082fc66762cb43a25955a971082a0a5aab0840;hp=5761acd4e7d2ef0688ac4e41f4d718842cb3d2b0;hpb=168c326b585555e4ea6d444ad96a83d880d5c7e3;p=supertux.git diff --git a/src/title.cpp b/src/title.cpp index 5761acd4e..01dacb0b6 100644 --- a/src/title.cpp +++ b/src/title.cpp @@ -10,6 +10,7 @@ April 11, 2000 - March 15, 2004 */ +#include #include #include #include @@ -39,16 +40,14 @@ #include "player.h" #include "math.h" #include "tile.h" +#include "resources.h" -void loadshared(void); - -static texture_type bkg_title; -static texture_type logo; -static texture_type img_choose_subset; +static Surface* bkg_title; +static Surface* logo; +static Surface* img_choose_subset; static bool walking; -static Player titletux; -static timer_type random_timer; +static Timer random_timer; static SDL_Event event; static SDLKey key; @@ -58,15 +57,108 @@ static unsigned int update_time; void display_credits(); +std::vector contrib_subsets; +std::string current_contrib_subset; + +void update_contrib_menu() +{ + // FIXME: Hack to update only once + static bool up_to_date = false; + + 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); + + 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); + + string_list_free(&level_subsets); + up_to_date = true; + } +} + +void check_contrib_menu() +{ + static int current_subset = -1; + + int index = contrib_menu->check(); + if (index != -1) + { + index -= 2; // FIXME: Hack + if (index >= 0 && index <= int(contrib_subsets.size())) + { + if (current_subset != index) + { + current_subset = index; + // FIXME: This shouln't be busy looping + st_subset& subset = contrib_subsets[index]; + + current_contrib_subset = subset.name; + + 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) + { + Level level; + level.load(subset.name, i); + contrib_subset_menu->additem(MN_ACTION, level.name, 0, 0); + } + contrib_subset_menu->additem(MN_HL,"",0,0); + contrib_subset_menu->additem(MN_BACK, "Back", 0, 0); + } + } + else + { + // Back button + } + } +} + +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_reset(); + Menu::set_current(main_menu); + show_menu = 1; + } +} + void draw_background() { /* Draw the title background: */ - texture_draw_bg(&bkg_title); + bkg_title->draw_bg(); } -void draw_demo(Level* plevel) +void draw_demo(GameSession* session, double frame_ratio) { + World::set_current(session->get_world()); + //World* world = session->get_world(); + Level* plevel = session->get_level(); + Player* tux = session->get_world()->get_tux(); + /* FIXME: // update particle systems std::vector::iterator p; @@ -93,60 +185,54 @@ void draw_demo(Level* plevel) } global_frame_counter++; - titletux.key_event(SDLK_RIGHT,DOWN); + tux->key_event(SDLK_RIGHT,DOWN); - if(timer_check(&random_timer)) + if(random_timer.check()) { if(walking) - titletux.key_event(SDLK_UP,UP); + tux->key_event(SDLK_UP,UP); else - titletux.key_event(SDLK_UP,DOWN); + tux->key_event(SDLK_UP,DOWN); } else { - timer_start(&random_timer, rand() % 3000 + 3000); + random_timer.start(rand() % 3000 + 3000); walking = !walking; } // Wrap around at the end of the level back to the beginnig - if(plevel->width * 32 - 320 < titletux.base.x) + if(plevel->width * 32 - 320 < tux->base.x) { - titletux.base.x = titletux.base.x - (plevel->width * 32 - 640); - scroll_x = titletux.base.x - 320; + tux->base.x = tux->base.x - (plevel->width * 32 - 640); + scroll_x = tux->base.x - 320; } - float last_tux_x_pos = titletux.base.x; - titletux.action(); + + + float last_tux_x_pos = tux->base.x; + tux->action(frame_ratio); // Jump if tux stays in the same position for one loop, ie. if he is // stuck behind a wall - if (last_tux_x_pos == titletux.base.x) + if (last_tux_x_pos == tux->base.x) walking = false; - titletux.draw(); - - /* DEMO end */ + tux->draw(); } /* --- TITLE SCREEN --- */ - bool title(void) { - string_list_type level_subsets; st_subset subset; - level_subsets = dsubdirs("/levels", "info"); - timer_init(&random_timer, true); + random_timer.init(true); walking = true; - titletux.init(); st_pause_ticks_init(); GameSession session(datadir + "/levels/misc/menu.stl"); - loadshared(); + //FIXME:activate_particle_systems(); - /* Lower the gravity that tux doesn't jump to hectically through the demo */ - //gravity = 5; /* Reset menu variables */ menu_reset(); @@ -157,9 +243,9 @@ bool title(void) /* Load images: */ - texture_load(&bkg_title,datadir + "/images/title/background.jpg", IGNORE_ALPHA); - texture_load(&logo,datadir + "/images/title/logo.png", USE_ALPHA); - texture_load(&img_choose_subset,datadir + "/images/status/choose-level-subset.png", USE_ALPHA); + 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); /* --- Main title loop: --- */ bool done = 0; @@ -167,16 +253,16 @@ bool title(void) frame = 0; /* Draw the title background: */ - texture_draw_bg(&bkg_title); + bkg_title->draw_bg(); load_hs(); update_time = st_get_ticks(); - timer_start(&random_timer, rand() % 2000 + 2000); + random_timer.start(rand() % 2000 + 2000); while (!done) { /* Calculate the movement-factor */ - frame_ratio = ((double)(update_time-last_update_time))/((double)FRAME_RATE); + double frame_ratio = ((double)(update_time-last_update_time))/((double)FRAME_RATE); 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. */ @@ -186,7 +272,7 @@ bool title(void) while (SDL_PollEvent(&event)) { - menu_event(event); + current_menu->event(event); if (event.type == SDL_QUIT) { done = true; @@ -209,12 +295,12 @@ bool title(void) /* Draw the background: */ draw_background(); - draw_demo(session.get_level()); + draw_demo(&session, frame_ratio); if (current_menu == main_menu) - texture_draw(&logo, 160, 30); + logo->draw( 160, 30); - text_draw(&white_small_text, + 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" @@ -240,6 +326,9 @@ bool title(void) { #if 0 case 0: + string_list_type level_subsets; + level_subsets = dsubdirs("/levels", "info"); + // Quick Play // FIXME: obsolete done = 0; @@ -249,16 +338,16 @@ bool title(void) subset.load(level_subsets.item[0]); while(!done) { - texture_draw(&img_choose_subset,(screen->w - img_choose_subset.w) / 2, 0); + img_choose_subset->draw((screen->w - img_choose_subset.w) / 2, 0); if(level_subsets.num_items != 0) { - texture_draw(&subset.image,(screen->w - subset.image.w) / 2 + 25,78); + subset.image->draw((screen->w - subset.image.w) / 2 + 25,78); if(level_subsets.num_items > 1) { if(i > 0) - texture_draw(&arrow_left,(screen->w / 2) - ((subset.title.length()+2)*16)/2,20); + arrow_left->draw((screen->w / 2) - ((subset.title.length()+2)*16)/2,20); if(i < level_subsets.num_items-1) - texture_draw(&arrow_right,(screen->w / 2) + ((subset.description.length())*16)/2,20); + arrow_right->draw((screen->w / 2) + ((subset.description.length())*16)/2,20); } text_drawf(&gold_text, subset.title.c_str(), 0, 20, A_HMIDDLE, A_TOP, 1); text_drawf(&gold_text, subset.description.c_str(), 20, -20, A_HMIDDLE, A_BOTTOM, 1); @@ -323,10 +412,14 @@ bool title(void) break; case 1: // Contrib Menu + update_contrib_menu(); break; case 3: - done = 1; + done = true; done = leveleditor(1); + menu_reset(); + show_menu = 1; + Menu::set_current(main_menu); break; case 4: display_credits(); @@ -344,15 +437,20 @@ bool title(void) { 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(); + //titletux.level_begin(); update_time = st_get_ticks(); } } else if(current_menu == contrib_menu) { - + check_contrib_menu(); + } + else if (current_menu == contrib_subset_menu) + { + check_contrib_subset_menu(); } mouse_cursor->draw(); @@ -370,10 +468,9 @@ bool title(void) } /* Free surfaces: */ - texture_free(&bkg_title); - texture_free(&logo); - string_list_free(&level_subsets); - + delete bkg_title; + delete logo; + /* Return to main! */ return done; } @@ -386,7 +483,7 @@ void display_credits() { int done; int scroll, speed; - timer_type timer; + Timer timer; int n,d; int length; FILE* fi; @@ -413,8 +510,8 @@ void display_credits() } - timer_init(&timer, SDL_GetTicks()); - timer_start(&timer, 50); + timer.init(SDL_GetTicks()); + timer.start(50); scroll = 0; speed = 2; @@ -469,7 +566,7 @@ void display_credits() draw_background(); - text_drawf(&white_big_text, "- Credits -", 0, screen->h-scroll, A_HMIDDLE, A_TOP, 2); + 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++) { @@ -478,13 +575,13 @@ void display_credits() else { if(names.item[i][0] == ' ') - text_drawf(&white_small_text, names.item[i], 0, 60+screen->h+(n*18)+(d*18)-scroll-10, A_HMIDDLE, A_TOP, 1); + 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] == ' ') - text_drawf(&white_text, names.item[i], 0, 60+screen->h+(n*18)+(d*18)-scroll, A_HMIDDLE, A_TOP, 1); + 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] == '-') - text_drawf(&white_big_text, names.item[i], 0, 60+screen->h+(n*18)+(d*18)-scroll, A_HMIDDLE, A_TOP, 3); + white_big_text->drawf(names.item[i], 0, 60+screen->h+(n*18)+(d*18)-scroll, A_HMIDDLE, A_TOP, 3); else - text_drawf(&blue_text, names.item[i], 0, 60+screen->h+(n*18)+(d*18)-scroll, A_HMIDDLE, A_TOP, 1); + blue_text->drawf(names.item[i], 0, 60+screen->h+(n*18)+(d*18)-scroll, A_HMIDDLE, A_TOP, 1); } } @@ -499,10 +596,10 @@ void display_credits() SDL_Delay(35); - if(timer_get_left(&timer) < 0) + if(timer.get_left() < 0) { frame++; - timer_start(&timer, 50); + timer.start(50); } } string_list_free(&names);