X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Ftitle.cpp;h=69fdb798b7398ae63e6aa578ab406f7792e18d6a;hb=07a60074d2369ec9f49754f15277f5242482df84;hp=96dca7288a8f024cde7ad4b94bd5c52991378c5c;hpb=b077bfe311e9c8a5d3fb8a78d348a061d67860a6;p=supertux.git diff --git a/src/title.cpp b/src/title.cpp index 96dca7288..69fdb798b 100644 --- a/src/title.cpp +++ b/src/title.cpp @@ -20,11 +20,13 @@ // 02111-1307, USA. #include +#include #include #include #include #include #include +#include #include #include @@ -34,22 +36,29 @@ #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 "special/frame_rate.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; @@ -59,75 +68,133 @@ static bool walking; static Timer random_timer; static int frame; -static unsigned int last_update_time; -static unsigned int update_time; -void display_text_file(char *filename); +static GameSession* titlesession; -std::vector contrib_subsets; -std::string current_contrib_subset; +static std::vector contrib_subsets; +static LevelSubset* current_contrib_subset = 0; -void generate_contrib_menu() +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() { - string_list_type level_subsets = dsubdirs("/levels", "info"); + for(std::vector::iterator i = contrib_subsets.begin(); + i != contrib_subsets.end(); ++i) + delete *i; + contrib_subsets.clear(); contrib_menu->clear(); - contrib_menu->additem(MN_LABEL,"Contrib Levels",0,0); - contrib_menu->additem(MN_HL,"",0,0); +} + +void generate_contrib_menu() +{ + + /** Generating contrib levels list by making use of Level Subset */ + std::set level_subsets = FileSystem::dsubdirs("/levels", "info"); - for (int i = 0; i < level_subsets.num_items; ++i) + 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) { - st_subset subset; - subset.load(level_subsets.item[i]); - contrib_menu->additem(MN_GOTO, subset.title.c_str(), i, - contrib_subset_menu, i+1); + 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()); + ++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 - st_subset& 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); } } @@ -138,55 +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() +void draw_demo(double frame_ratio) { - /* Draw the title background: */ - - bkg_title->draw_bg(); -} + Sector* world = titlesession->get_current_sector(); + Player* tux = world->player; -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(); - - session->get_world()->play_music(LEVEL_MUSIC); + 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); @@ -202,59 +240,69 @@ void draw_demo(GameSession* session, double frame_ratio) 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 < 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; float last_tux_x_pos = tux->base.x; - tux->action(frame_ratio); + world->action(frame_ratio); + + // 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) - walking = false; + { + walking = false; + } - tux->draw(); + world->draw(*titlesession->context); } /* --- TITLE SCREEN --- */ void title(void) { - st_subset subset; random_timer.init(true); walking = true; - st_pause_ticks_init(); - - GameSession session(datadir + "/levels/misc/menu.stl", 0, ST_GL_DEMO_GAME); + Ticks::pause_init(); - 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", "", "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(); + FrameRate frame_rate(100); + frame_rate.set_frame_limit(false); + 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 + frame_rate.smooth_hanger(); + // Calculate the movement-factor - double frame_ratio = ((double)(update_time-last_update_time))/((double)FRAME_RATE); + double frame_ratio = frame_rate.get(); + 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. */ @@ -271,28 +319,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), 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()), LEFT_ALLIGN, 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()) @@ -301,17 +350,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); + frame_rate.update(); break; case MNID_CREDITS: - display_text_file("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: @@ -325,18 +377,36 @@ void title(void) } else if(menu == load_game_menu) { - if (process_load_game_menu()) + if(event.key.keysym.sym == SDLK_DELETE) + { + int slot = menu->get_active_item_id(); + std::stringstream stream; + stream << slot; + std::string str = _("Are you sure you want to delete slot") + stream.str() + "?"; + + if(confirm_dialog(bkg_title, str.c_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(); + } + 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(); + frame_rate.update(); } } else if(menu == contrib_menu) { - check_contrib_menu(); + check_levels_contrib_menu(); } else if (menu == contrib_subset_menu) { @@ -344,13 +414,11 @@ 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(); + frame_rate.update(); /* Pause: */ frame++; @@ -358,148 +426,14 @@ void title(void) } /* Free surfaces: */ + free_contrib_menu(); + worldmap_list.clear(); + delete titlesession; delete bkg_title; delete logo; + delete img_choose_subset; } -#define MAX_VEL 10 -#define SPEED 1 -#define SCROLL 60 -#define ITEMS_SPACE 4 - -void display_text_file(char *file) -{ - int done; - int scroll, speed; - int y; - Timer timer; - int length; - FILE* fi; - char temp[1024]; - string_list_type names; - char filename[1024]; - string_list_init(&names); - sprintf(filename,"%s/%s", datadir.c_str(), file); - if((fi = fopen(filename,"r")) != NULL) - { - while(fgets(temp, sizeof(temp), fi) != NULL) - { - temp[strlen(temp)-1]='\0'; - string_list_add_item(&names,temp); - } - fclose(fi); - } - else - { - string_list_add_item(&names,"Credits were not found!"); - string_list_add_item(&names,"Shame on the guy, who"); - string_list_add_item(&names,"forgot to include them"); - string_list_add_item(&names,"in your SuperTux distribution."); - } - - timer.init(SDL_GetTicks()); - timer.start(50); +// EOF // - scroll = 0; - speed = 2; - done = 0; - - length = names.num_items; - - SDL_EnableKeyRepeat(SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL); - - while(done == 0) - { - /* in case of input, exit */ - SDL_Event event; - while(SDL_PollEvent(&event)) - switch(event.type) - { - case SDL_KEYDOWN: - switch(event.key.keysym.sym) - { - case SDLK_UP: - speed -= SPEED; - break; - case SDLK_DOWN: - speed += SPEED; - break; - case SDLK_SPACE: - case SDLK_RETURN: - if(speed >= 0) - scroll += SCROLL; - break; - case SDLK_ESCAPE: - done = 1; - break; - default: - break; - } - break; - case SDL_QUIT: - done = 1; - break; - default: - break; - } - - if(speed > MAX_VEL) - speed = MAX_VEL; - else if(speed < -MAX_VEL) - speed = -MAX_VEL; - - /* draw the credits */ - - draw_background(); - - if (strcmp(file, "CREDITS") == 0) - white_big_text->drawf("- SuperTux " VERSION " -", - 0, screen->h-scroll, A_HMIDDLE, A_TOP, 2); - - y = 0; - for(int i = 0; i < length; i++) - { - 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+y-scroll < 0 && 20+60+screen->h+y-scroll < 0) - done = 1; - - scroll += speed; - if(scroll < 0) - scroll = 0; - - SDL_Delay(35); - - if(timer.get_left() < 0) - { - frame++; - timer.start(50); - } - } - string_list_free(&names); - - SDL_EnableKeyRepeat(0, 0); // disables key repeating - Menu::set_current(main_menu); -}