X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fgame_session.cpp;h=1532e3942a91600bb79296b76e7df80974487bae;hb=edd21bac021e9586d8edc831c231c226d5ff1bc7;hp=5e77dc482843b19b22432230399a942543f4860e;hpb=b72a5956e9192f10b22dc80d637b4290bc0dfd69;p=supertux.git diff --git a/src/game_session.cpp b/src/game_session.cpp index 5e77dc482..1532e3942 100644 --- a/src/game_session.cpp +++ b/src/game_session.cpp @@ -1,9 +1,7 @@ // $Id$ -// +// // SuperTux -// Copyright (C) 2000 Bill Kendrick -// Copyright (C) 2004 Tobias Glaesser -// Copyright (C) 2004 Ingo Ruhnke +// Copyright (C) 2006 Matthias Braun // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License @@ -14,7 +12,7 @@ // 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. @@ -35,7 +33,9 @@ #include #include "game_session.hpp" -#include "msg.hpp" +#include "log.hpp" +#include "worldmap/worldmap.hpp" +#include "mainloop.hpp" #include "video/screen.hpp" #include "audio/sound_manager.hpp" #include "gui/menu.hpp" @@ -53,7 +53,6 @@ #include "lisp/lisp.hpp" #include "lisp/parser.hpp" #include "resources.hpp" -#include "worldmap.hpp" #include "misc.hpp" #include "statistics.hpp" #include "timer.hpp" @@ -65,7 +64,7 @@ #include "file_system.hpp" #include "gameconfig.hpp" #include "gettext.hpp" -#include "exceptions.hpp" +#include "console.hpp" #include "flip_level_transformer.hpp" // the engine will be run with a logical framerate of 64fps. @@ -73,7 +72,7 @@ // binary fraction... static const float LOGICAL_FPS = 64.0; -GameSession* GameSession::current_ = 0; +GameSession* GameSession::current_ = NULL; GameSession::GameSession(const std::string& levelfile_, GameSessionMode mode, Statistics* statistics) @@ -83,14 +82,12 @@ GameSession::GameSession(const std::string& levelfile_, GameSessionMode mode, capture_demo_stream(0), playback_demo_stream(0), demo_controller(0) { current_ = this; - currentsector = 0; + currentsector = NULL; game_pause = false; fps_fps = 0; - context = new DrawingContext(); - console = new Console(context); - Console::registerCommandReceiver(this); + statistics_backdrop.reset(new Surface("images/engine/menu/score-backdrop.png")); restart_level(true); } @@ -99,15 +96,13 @@ void GameSession::restart_level(bool fromBeginning) { game_pause = false; - exit_status = ES_NONE; end_sequence = NO_ENDSEQUENCE; main_controller->reset(); - delete level; currentsector = 0; - level = new Level; + level.reset(new Level); level->load(levelfile); global_stats.reset(); @@ -164,10 +159,6 @@ GameSession::~GameSession() delete demo_controller; delete end_sequence_controller; - delete level; - delete context; - Console::unregisterCommandReceiver(this); - delete console; current_ = NULL; } @@ -243,9 +234,6 @@ GameSession::levelintro() if(best_level_statistics != NULL) best_level_statistics->draw_message_info(context, _("Best Level Statistics")); - console->draw(); - context.do_drawing(); - wait_for_event(1.0, 3.0); } @@ -256,12 +244,13 @@ GameSession::on_escape_press() return; // don't let the player open the menu, when he is dying if(mode == ST_GL_TEST) { - exit_status = ES_LEVEL_ABORT; + main_loop->exit_screen(); } else if (!Menu::current()) { Menu::set_current(game_menu); game_menu->set_active_item(MNID_CONTINUE); game_pause = true; } else { + Menu::set_current(NULL); game_pause = false; } } @@ -270,7 +259,6 @@ void GameSession::process_events() { Player& tux = *currentsector->player; - main_controller->update(); // end of pause mode? if(!Menu::current() && game_pause) { @@ -290,17 +278,6 @@ GameSession::process_events() last_x_pos = tux.get_pos().x; } - main_controller->update(); - SDL_Event event; - while (SDL_PollEvent(&event)) { - /* Check for menu-events, if the menu is shown */ - if (Menu::current()) - Menu::current()->event(event); - main_controller->process_event(event); - if(event.type == SDL_QUIT) - throw graceful_shutdown(); - } - // playback a demo? if(playback_demo_stream != 0) { demo_controller->update(); @@ -335,117 +312,6 @@ GameSession::process_events() } } -bool -GameSession::consoleCommand(std::string command) -{ - if (command == "foo") { - msg_info("bar"); - return true; - } - - //TODO: Build command list automatically - if (command == "cmdlist") { - msg_info("foo, cmdlist, cheats, whereami, camera"); - return true; - } - //TODO: remove (or at least hide) this before release - if (command == "cheats") { - msg_info("grow, fire, ice, lifeup, numberofthebeast, lifedown, grease, invincible, mortal, shrink, kill, gotoend, flip, finish"); - return true; - } - - if (currentsector == 0) return false; - Player& tux = *currentsector->player; - - // Cheating words (the goal of this is really for debugging, - // but could be used for some cheating, nothing wrong with that) - if (command == "grow") { - tux.set_bonus(GROWUP_BONUS, false); - return true; - } - if (command == "fire") { - tux.set_bonus(FIRE_BONUS, false); - return true; - } - if (command == "ice") { - tux.set_bonus(ICE_BONUS, false); - return true; - } - if (command == "lifeup") { - player_status->incLives(); - return true; - } - if (command == "numberofthebeast") { - player_status->coins += 55; - return true; - } - if (command == "lifedown") { - player_status->coins = std::max(player_status->coins-25, 0); - return true; - } - if (command == "grease") { - tux.physic.set_velocity_x(tux.physic.get_velocity_x()*3); - return true; - } - if (command == "invincible") { - // be invincle for the rest of the level - tux.invincible_timer.start(10000); - return true; - } - if (command == "mortal") { - // give up invincibility - tux.invincible_timer.stop(); - return true; - } - if (command == "shrink") { - // remove powerups - tux.kill(tux.SHRINK); - return true; - } - if (command == "kill") { - tux.kill(tux.KILL); - return true; - } - if (command == "whereami") { - msg_info("You are at x " << tux.get_pos().x << ", y " << tux.get_pos().y); - return true; - } -#if 0 - if(command == "grid")) { - // toggle debug grid - debug_grid = !debug_grid; - return true; - } -#endif - if (command == "gotoend") { - // goes to the end of the level - tux.move(Vector( - (currentsector->solids->get_width()*32) - (SCREEN_WIDTH*2), 0)); - currentsector->camera->reset( - Vector(tux.get_pos().x, tux.get_pos().y)); - return true; - } - if (command == "flip") { - FlipLevelTransformer flip_transformer; - flip_transformer.transform(GameSession::current()->get_current_level()); - return true; - } - if (command == "finish") { - // finish current sector - exit_status = ES_LEVEL_FINISHED; - // don't add points to stats though... - return true; - } - if (command == "camera") { - msg_info("Camera is at " - << Sector::current()->camera->get_translation().x << "," - << Sector::current()->camera->get_translation().y); - return true; - } - - return false; -} - void GameSession::check_end_conditions() { @@ -453,29 +319,7 @@ GameSession::check_end_conditions() /* End of level? */ if(end_sequence && endsequence_timer.check()) { - exit_status = ES_LEVEL_FINISHED; - - // add time spent to statistics - int tottime = 0, remtime = 0; - for(std::vector::iterator i = level->sectors.begin(); i != level->sectors.end(); ++i) - { - Sector* sec = *i; - - for(std::vector::iterator j = sec->gameobjects.begin(); - j != sec->gameobjects.end(); ++j) - { - GameObject* obj = *j; - - LevelTime* lt = dynamic_cast (obj); - if(lt) - { - tottime += int(lt->get_level_time()); - remtime += int(lt->get_remaining_time()); - } - } - } - global_stats.set_points(TIME_NEEDED_STAT, (tottime == 0 ? -1 : (tottime-remtime))); - + finish(true); return; } else if (!end_sequence && tux->is_dead()) { if (player_status->coins < 0) { @@ -491,57 +335,20 @@ GameSession::check_end_conditions() } } -void -GameSession::update(float elapsed_time) -{ - // handle controller - if(main_controller->pressed(Controller::PAUSE_MENU)) - on_escape_press(); - - // advance timers - if(!currentsector->player->growing_timer.started()) { - // Update Tux and the World - currentsector->update(elapsed_time); - } - - // respawning in new sector? - if(newsector != "" && newspawnpoint != "") { - Sector* sector = level->get_sector(newsector); - if(sector == 0) { - msg_warning("Sector '" << newsector << "' not found"); - } - sector->activate(newspawnpoint); - sector->play_music(LEVEL_MUSIC); - currentsector = sector; - newsector = ""; - newspawnpoint = ""; - } - - // update sounds - sound_manager->set_listener_position(currentsector->player->get_pos()); -} - void -GameSession::draw() +GameSession::draw(DrawingContext& context) { - currentsector->draw(*context); - drawstatus(*context); + currentsector->draw(context); + drawstatus(context); if(game_pause) - draw_pause(); - - if(Menu::current()) { - Menu::current()->draw(*context); - } - - console->draw(); - context->do_drawing(); + draw_pause(context); } void -GameSession::draw_pause() +GameSession::draw_pause(DrawingContext& context) { - context->draw_filled_rect( + context.draw_filled_rect( Vector(0,0), Vector(SCREEN_WIDTH, SCREEN_HEIGHT), Color(.2, .2, .2, .5), LAYER_FOREGROUND1); } @@ -560,18 +367,81 @@ GameSession::process_menu() break; case MNID_ABORTLEVEL: Menu::set_current(0); - exit_status = ES_LEVEL_ABORT; + main_loop->exit_screen(); break; } - } else if(menu == options_menu) { - process_options_menu(); - } else if(menu == load_game_menu ) { - process_load_game_menu(); } } } +void +GameSession::setup() +{ + Menu::set_current(NULL); + current_ = this; + + // Eat unneeded events + SDL_Event event; + while(SDL_PollEvent(&event)) + {} +} + +void +GameSession::update(float elapsed_time) +{ + process_events(); + process_menu(); + + check_end_conditions(); + // handle controller + if(main_controller->pressed(Controller::PAUSE_MENU)) + on_escape_press(); + + // respawning in new sector? + if(newsector != "" && newspawnpoint != "") { + Sector* sector = level->get_sector(newsector); + if(sector == 0) { + log_warning << "Sector '" << newsector << "' not found" << std::endl; + } + sector->activate(newspawnpoint); + sector->play_music(LEVEL_MUSIC); + currentsector = sector; + newsector = ""; + newspawnpoint = ""; + } + + // Update the world state and all objects in the world + if(!game_pause) { + // Update the world + if (end_sequence == ENDSEQUENCE_RUNNING) { + currentsector->update(elapsed_time/2); + } else if(end_sequence == NO_ENDSEQUENCE) { + if(!currentsector->player->growing_timer.started()) + currentsector->update(elapsed_time); + } + } + + // update sounds + sound_manager->set_listener_position(currentsector->player->get_pos()); + + /* Handle music: */ + if (end_sequence) + return; + + if(currentsector->player->invincible_timer.started()) { + if(currentsector->player->invincible_timer.get_timeleft() <= + TUX_INVINCIBLE_TIME_WARNING) { + currentsector->play_music(HERRING_WARNING_MUSIC); + } else { + currentsector->play_music(HERRING_MUSIC); + } + } else if(currentsector->get_music_type() != LEVEL_MUSIC) { + currentsector->play_music(LEVEL_MUSIC); + } +} + +#if 0 GameSession::ExitStatus GameSession::run() { @@ -594,6 +464,8 @@ GameSession::run() while (exit_status == ES_NONE) { // we run in a logical framerate so elapsed time is a constant + // This will make the game run determistic and not different on different + // machines static const float elapsed_time = 1.0 / LOGICAL_FPS; // old code... float elapsed_time = float(ticks - lastticks) / 1000.; if(!game_pause) @@ -624,25 +496,11 @@ GameSession::run() } fps_nextframe_ticks = ticks + (Uint32) (1000.0 / LOGICAL_FPS); -#if 0 - float diff = SDL_GetTicks() - fps_nextframe_ticks; - if (diff > 5.0) { - // sets the ticks that must have elapsed - fps_nextframe_ticks = SDL_GetTicks() + (1000.0 / LOGICAL_FPS); - } else { - // sets the ticks that must have elapsed - // in order for the next frame to start. - fps_nextframe_ticks += 1000.0 / LOGICAL_FPS; - } -#endif - process_events(); process_menu(); // Update the world state and all objects in the world - // Do that with a constante time-delta so that the game will run - // determistic and not different on different machines - if(!game_pause && !Menu::current()) + if(!game_pause) { // Update the world check_end_conditions(); @@ -651,10 +509,6 @@ GameSession::run() else if(end_sequence == NO_ENDSEQUENCE) update(elapsed_time); } - else - { - ++pause_menu_frame; - } if(!skipdraw) draw(); @@ -668,8 +522,6 @@ GameSession::run() continue; } - //frame_rate.update(); - /* Handle music: */ if (currentsector->player->invincible_timer.started() && currentsector->player->invincible_timer.get_timeleft() @@ -702,14 +554,19 @@ GameSession::run() main_controller->reset(); return exit_status; } +#endif void GameSession::finish(bool win) { - if(win) - exit_status = ES_LEVEL_FINISHED; - else - exit_status = ES_LEVEL_ABORT; + using namespace WorldMapNS; + + if(win) { + if(WorldMap::current()) + WorldMap::current()->finished_level(levelfile); + } + + main_loop->exit_screen(); } void @@ -738,14 +595,17 @@ GameSession::display_info_box(const std::string& text) InfoBox* box = new InfoBox(text); bool running = true; + DrawingContext context; + while(running) { + // TODO make a screen out of this, another mainloop is ugly main_controller->update(); SDL_Event event; while (SDL_PollEvent(&event)) { main_controller->process_event(event); if(event.type == SDL_QUIT) - throw graceful_shutdown(); + main_loop->quit(); } if(main_controller->pressed(Controller::JUMP) @@ -757,8 +617,9 @@ GameSession::display_info_box(const std::string& text) box->scrolldown(); else if(main_controller->pressed(Controller::UP)) box->scrollup(); - box->draw(*context); - draw(); + box->draw(context); + draw(context); + context.do_drawing(); sound_manager->update(); } @@ -789,18 +650,38 @@ GameSession::start_sequence(const std::string& sequencename) lt->stop(); } + // add time spent to statistics + int tottime = 0, remtime = 0; + for(std::vector::iterator i = level->sectors.begin(); i != level->sectors.end(); ++i) + { + Sector* sec = *i; + + for(std::vector::iterator j = sec->gameobjects.begin(); + j != sec->gameobjects.end(); ++j) + { + GameObject* obj = *j; + + LevelTime* lt = dynamic_cast (obj); + if(lt) + { + tottime += int(lt->get_level_time()); + remtime += int(lt->get_remaining_time()); + } + } + } + global_stats.set_points(TIME_NEEDED_STAT, (tottime == 0 ? -1 : (tottime-remtime))); + if(sequencename == "fireworks") { currentsector->add_object(new Fireworks()); } } else if(sequencename == "stoptux") { if(!end_sequence) { - msg_warning("Final target reached without " - << "an active end sequence"); + log_warning << "Final target reached without an active end sequence" << std::endl; this->start_sequence("endsequence"); } end_sequence = ENDSEQUENCE_WAITING; } else { - msg_warning("Unknown sequence '" << sequencename << "'"); + log_warning << "Unknown sequence '" << sequencename << "'" << std::endl; } } @@ -817,95 +698,10 @@ GameSession::drawstatus(DrawingContext& context) context.draw_text(white_text, fpstext, Vector(SCREEN_WIDTH - white_text->get_text_width(fpstext) - gold_text->get_text_width(" 99999") - BORDER_X, BORDER_Y + 20), LEFT_ALLIGN, LAYER_FOREGROUND1); context.draw_text(gold_text, str, Vector(SCREEN_WIDTH - BORDER_X, BORDER_Y + 20), RIGHT_ALLIGN, LAYER_FOREGROUND1); } -} - -void -GameSession::drawresultscreen() -{ - char str[80]; - - DrawingContext context; - for(Sector::GameObjects::iterator i = currentsector->gameobjects.begin(); - i != currentsector->gameobjects.end(); ++i) { - Background* background = dynamic_cast (*i); - if(background) { - background->draw(context); - } - } - - context.draw_text(blue_text, _("Result:"), Vector(SCREEN_WIDTH/2, 200), - CENTER_ALLIGN, LAYER_FOREGROUND1); - -// sprintf(str, _("SCORE: %d"), global_stats.get_points(SCORE_STAT)); -// context.draw_text(gold_text, str, Vector(SCREEN_WIDTH/2, 224), CENTER_ALLIGN, LAYER_FOREGROUND1); - - // y == 256 before removal of score - sprintf(str, _("COINS: %d"), player_status->coins); - context.draw_text(gold_text, str, Vector(SCREEN_WIDTH/2, 224), CENTER_ALLIGN, LAYER_FOREGROUND1); - console->draw(); - context.do_drawing(); - - wait_for_event(2.0, 5.0); -} - -std::string slotinfo(int slot) -{ - std::string tmp; - std::string slotfile; - std::string title; - std::stringstream stream; - stream << slot; - slotfile = "save/slot" + stream.str() + ".stsg"; - - try { - lisp::Parser parser; - std::auto_ptr root (parser.parse(slotfile)); - - const lisp::Lisp* savegame = root->get_lisp("supertux-savegame"); - if(!savegame) - throw std::runtime_error("file is not a supertux-savegame."); - - savegame->get("title", title); - } catch(std::exception& e) { - return std::string(_("Slot")) + " " + stream.str() + " - " + - std::string(_("Free")); + // draw level stats while end_sequence is running + if (end_sequence) { + global_stats.draw_endseq_panel(context, best_level_statistics, statistics_backdrop.get()); } - - return std::string("Slot ") + stream.str() + " - " + title; } -bool process_load_game_menu() -{ - int slot = load_game_menu->check(); - - if(slot == -1) - return false; - - if(load_game_menu->get_item_by_id(slot).kind != MN_ACTION) - return false; - - std::stringstream stream; - stream << slot; - std::string slotfile = "save/slot" + stream.str() + ".stsg"; - - sound_manager->stop_music(); - fadeout(256); - DrawingContext context; - context.draw_text(white_text, "Loading...", - Vector(SCREEN_WIDTH/2, SCREEN_HEIGHT/2), - CENTER_ALLIGN, LAYER_FOREGROUND1); - context.do_drawing(); - - WorldMapNS::WorldMap worldmap; - - worldmap.set_map_filename("/levels/world1/worldmap.stwm"); - // Load the game or at least set the savegame_file variable - worldmap.loadgame(slotfile); - - worldmap.display(); - - Menu::set_current(main_menu); - - return true; -}