X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fgame_session.cpp;h=12c0bd1c0274730daf100adbef9b5ba7b6a884e9;hb=8f96892abd26903702f61978f74c2c5d012236ae;hp=1402e645742a88a78c99023171a538d8e66d7250;hpb=aeec9baba33ec63d2d0fdd97d961a53ec5c1541d;p=supertux.git diff --git a/src/game_session.cpp b/src/game_session.cpp index 1402e6457..12c0bd1c0 100644 --- a/src/game_session.cpp +++ b/src/game_session.cpp @@ -35,40 +35,39 @@ #include -#ifndef WIN32 -#include -#include -#endif - -#include "game_session.h" -#include "video/screen.h" -#include "gui/menu.h" -#include "sector.h" -#include "level.h" -#include "tile.h" -#include "player_status.h" -#include "object/particlesystem.h" -#include "object/background.h" -#include "object/tilemap.h" -#include "object/camera.h" -#include "object/player.h" -#include "lisp/lisp.h" -#include "lisp/parser.h" -#include "resources.h" -#include "worldmap.h" -#include "misc.h" -#include "statistics.h" -#include "timer.h" -#include "object/fireworks.h" -#include "textscroller.h" -#include "control/codecontroller.h" -#include "control/joystickkeyboardcontroller.h" -#include "main.h" -#include "gameconfig.h" -#include "gettext.h" - -// the engine will be run with a lofical framerate of 64fps. -// We choose 64fps here because it is a power of 2, so 1/64 gives an "even" +#include "game_session.hpp" +#include "video/screen.hpp" +#include "audio/sound_manager.hpp" +#include "gui/menu.hpp" +#include "sector.hpp" +#include "level.hpp" +#include "tile.hpp" +#include "player_status.hpp" +#include "object/particlesystem.hpp" +#include "object/background.hpp" +#include "object/tilemap.hpp" +#include "object/camera.hpp" +#include "object/player.hpp" +#include "lisp/lisp.hpp" +#include "lisp/parser.hpp" +#include "resources.hpp" +#include "worldmap.hpp" +#include "misc.hpp" +#include "statistics.hpp" +#include "timer.hpp" +#include "object/fireworks.hpp" +#include "textscroller.hpp" +#include "control/codecontroller.hpp" +#include "control/joystickkeyboardcontroller.hpp" +#include "main.hpp" +#include "file_system.hpp" +#include "gameconfig.hpp" +#include "gettext.hpp" +#include "exceptions.hpp" +#include "flip_level_transformer.hpp" + +// the engine will be run with a logical framerate of 64fps. +// We chose 64fps here because it is a power of 2, so 1/64 gives an "even" // binary fraction... static const float LOGICAL_FPS = 64.0; @@ -82,8 +81,10 @@ GameSession::GameSession(const std::string& levelfile_, GameSessionMode mode, capture_demo_stream(0), playback_demo_stream(0), demo_controller(0) { current_ = this; + currentsector = 0; game_pause = false; + music_playing = false; fps_fps = 0; context = new DrawingContext(); @@ -129,7 +130,11 @@ GameSession::restart_level() if(mode == ST_GL_PLAY || mode == ST_GL_LOAD_LEVEL_FILE) levelintro(); - currentsector->play_music(LEVEL_MUSIC); + if (!music_playing) + { + currentsector->play_music(LEVEL_MUSIC); + music_playing = true; + } if(capture_file != "") record_demo(capture_file); @@ -144,6 +149,8 @@ GameSession::~GameSession() delete end_sequence_controller; delete level; delete context; + + current_ = NULL; } void @@ -181,8 +188,6 @@ GameSession::play_demo(const std::string& filename) void GameSession::levelintro() { - sound_manager->halt_music(); - char str[60]; DrawingContext context; @@ -199,7 +204,7 @@ GameSession::levelintro() context.draw_center_text(gold_text, level->get_name(), Vector(0, 160), LAYER_FOREGROUND1); - sprintf(str, "TUX x %d", player_status.lives); + sprintf(str, "TUX x %d", player_status->lives); context.draw_text(white_text, str, Vector(SCREEN_WIDTH/2, 210), CENTER_ALLIGN, LAYER_FOREGROUND1); @@ -267,7 +272,7 @@ GameSession::process_events() Menu::current()->event(event); main_controller->process_event(event); if(event.type == SDL_QUIT) - throw std::runtime_error("Received window close"); + throw graceful_shutdown(); } // playback a demo? @@ -323,10 +328,10 @@ GameSession::try_cheats() tux.set_bonus(ICE_BONUS, false); } if(main_controller->check_cheatcode("lifeup")) { - player_status.lives++; + player_status->lives++; } if(main_controller->check_cheatcode("lifedown")) { - player_status.lives--; + player_status->lives--; } if(main_controller->check_cheatcode("grease")) { tux.physic.set_velocity_x(tux.physic.get_velocity_x()*3); @@ -335,25 +340,28 @@ GameSession::try_cheats() // be invincle for the rest of the level tux.invincible_timer.start(10000); } + if(main_controller->check_cheatcode("mortal")) { + // give up invincibility + tux.invincible_timer.stop(); + } if(main_controller->check_cheatcode("shrink")) { // remove powerups tux.kill(tux.SHRINK); } if(main_controller->check_cheatcode("kill")) { // kill Tux, but without losing a life - player_status.lives++; + player_status->lives++; tux.kill(tux.KILL); } + if(main_controller->check_cheatcode("whereami")) { + std::cout << "You are at x " << tux.get_pos().x << ", y " << tux.get_pos().y << "." << std::endl; + } #if 0 if(main_controller->check_cheatcode("grid")) { // toggle debug grid debug_grid = !debug_grid; } #endif - if(main_controller->check_cheatcode("hover")) { - // toggle hover ability on/off - tux.enable_hover = !tux.enable_hover; - } if(main_controller->check_cheatcode("gotoend")) { // goes to the end of the level tux.move(Vector( @@ -361,21 +369,15 @@ GameSession::try_cheats() currentsector->camera->reset( Vector(tux.get_pos().x, tux.get_pos().y)); } + if(main_controller->check_cheatcode("flip")) { + FlipLevelTransformer flip_transformer; + flip_transformer.transform(GameSession::current()->get_current_level()); + } if(main_controller->check_cheatcode("finish")) { // finish current sector exit_status = ES_LEVEL_FINISHED; // don't add points to stats though... } - // temporary to help player's choosing a flapping - if(main_controller->check_cheatcode("marek")) { - tux.flapping_mode = Player::MAREK_FLAP; - } - if(main_controller->check_cheatcode("ricardo")) { - tux.flapping_mode = Player::RICARDO_FLAP; - } - if(main_controller->check_cheatcode("ryan")) { - tux.flapping_mode = Player::RYAN_FLAP; - } } void @@ -388,7 +390,7 @@ GameSession::check_end_conditions() exit_status = ES_LEVEL_FINISHED; return; } else if (!end_sequence && tux->is_dead()) { - if (player_status.lives < 0) { // No more lives!? + if (player_status->lives < 0) { // No more lives!? exit_status = ES_GAME_OVER; } else { // Still has lives, so reset Tux to the levelstart restart_level(); @@ -423,6 +425,9 @@ GameSession::update(float elapsed_time) newsector = ""; newspawnpoint = ""; } + + // update sounds + sound_manager->set_listener_position(currentsector->player->get_pos()); } void @@ -444,33 +449,9 @@ GameSession::draw() void GameSession::draw_pause() { - int x = SCREEN_HEIGHT / 20; - for(int i = 0; i < x; ++i) { - context->draw_filled_rect( - Vector(i % 2 ? (pause_menu_frame * i)%SCREEN_WIDTH : - -((pause_menu_frame * i)%SCREEN_WIDTH) - ,(i*20+pause_menu_frame)%SCREEN_HEIGHT), - Vector(SCREEN_WIDTH,10), - Color(20,20,20, rand() % 20 + 1), LAYER_FOREGROUND1+1); - } - context->draw_filled_rect( Vector(0,0), Vector(SCREEN_WIDTH, SCREEN_HEIGHT), - Color(rand() % 50, rand() % 50, rand() % 50, 128), LAYER_FOREGROUND1); -#if 0 - context->draw_text(blue_text, _("PAUSE - Press 'P' To Play"), - Vector(SCREEN_WIDTH/2, 230), CENTER_ALLIGN, LAYER_FOREGROUND1+2); - - const char* str1 = _("Playing: "); - const char* str2 = level->get_name().c_str(); - - context->draw_text(blue_text, str1, - Vector((SCREEN_WIDTH - (blue_text->get_text_width(str1) + white_text->get_text_width(str2)))/2, 340), - LEFT_ALLIGN, LAYER_FOREGROUND1+2); - context->draw_text(white_text, str2, - Vector(((SCREEN_WIDTH - (blue_text->get_text_width(str1) + white_text->get_text_width(str2)))/2)+blue_text->get_text_width(str1), 340), - LEFT_ALLIGN, LAYER_FOREGROUND1+2); -#endif + Color(.2, .2, .2, .5), LAYER_FOREGROUND1); } void @@ -524,7 +505,7 @@ GameSession::run() static const float elapsed_time = 1.0 / LOGICAL_FPS; // old code... float elapsed_time = float(ticks - lastticks) / 1000.; if(!game_pause) - global_time += elapsed_time; + game_time += elapsed_time; // regulate fps ticks = SDL_GetTicks(); @@ -586,6 +567,9 @@ GameSession::run() if(!skipdraw) draw(); + // update sounds + sound_manager->update(); + /* Time stops in pause mode */ if(game_pause || Menu::current()) { @@ -595,7 +579,9 @@ GameSession::run() //frame_rate.update(); /* Handle music: */ - if (currentsector->player->invincible_timer.started() && !end_sequence) + if (currentsector->player->invincible_timer.started() && + currentsector->player->invincible_timer.get_timeleft() + > TUX_INVINCIBLE_TIME_WARNING && !end_sequence) { currentsector->play_music(HERRING_MUSIC); } @@ -648,6 +634,12 @@ GameSession::set_reset_point(const std::string& sector, const Vector& pos) reset_pos = pos; } +std::string +GameSession::get_working_directory() +{ + return FileSystem::dirname(levelfile); +} + void GameSession::display_info_box(const std::string& text) { @@ -661,7 +653,7 @@ GameSession::display_info_box(const std::string& text) while (SDL_PollEvent(&event)) { main_controller->process_event(event); if(event.type == SDL_QUIT) - throw std::runtime_error("Received window close event"); + throw graceful_shutdown(); } if(main_controller->pressed(Controller::JUMP) @@ -669,8 +661,13 @@ GameSession::display_info_box(const std::string& text) || main_controller->pressed(Controller::PAUSE_MENU) || main_controller->pressed(Controller::MENU_SELECT)) running = false; + else if(main_controller->pressed(Controller::DOWN)) + box->scrolldown(); + else if(main_controller->pressed(Controller::UP)) + box->scrollup(); box->draw(*context); draw(); + sound_manager->update(); } delete box; @@ -686,13 +683,18 @@ GameSession::start_sequence(const std::string& sequencename) end_sequence = ENDSEQUENCE_RUNNING; endsequence_timer.start(7.0); // 7 seconds until we finish the map last_x_pos = -1; - sound_manager->play_music(level_end_song, 0); + sound_manager->play_music("music/leveldone.ogg", false); currentsector->player->invincible_timer.start(7.0); if(sequencename == "fireworks") { currentsector->add_object(new Fireworks()); } } else if(sequencename == "stoptux") { + if(!end_sequence) { + std::cout << "WARNING: Final target reached without " + << "an active end sequence." << std::endl; + this->start_sequence("endsequence"); + } end_sequence = ENDSEQUENCE_WAITING; } else { std::cout << "Unknown sequence '" << sequencename << "'.\n"; @@ -703,17 +705,17 @@ GameSession::start_sequence(const std::string& sequencename) void GameSession::drawstatus(DrawingContext& context) { - player_status.draw(context); + player_status->draw(context); if(config->show_fps) { char str[60]; - snprintf(str, sizeof(str), "%2.1f", fps_fps); + snprintf(str, sizeof(str), "%3.1f", fps_fps); context.draw_text(white_text, "FPS", Vector(SCREEN_WIDTH - - white_text->get_text_width("FPS "), 40), + white_text->get_text_width("FPS ") - BORDER_X, BORDER_Y + 40), LEFT_ALLIGN, LAYER_FOREGROUND1); context.draw_text(gold_text, str, - Vector(SCREEN_WIDTH-4*16, 40), + Vector(SCREEN_WIDTH-4*16 - BORDER_X, BORDER_Y + 40), LEFT_ALLIGN, LAYER_FOREGROUND1); } } @@ -735,11 +737,12 @@ GameSession::drawresultscreen() 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); +// 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); - sprintf(str, _("COINS: %d"), player_status.coins); - context.draw_text(gold_text, str, Vector(SCREEN_WIDTH/2, 256), 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); context.do_drawing(); @@ -753,7 +756,7 @@ std::string slotinfo(int slot) std::string title; std::stringstream stream; stream << slot; - slotfile = user_dir + "/save/slot" + stream.str() + ".stsg"; + slotfile = "save/slot" + stream.str() + ".stsg"; try { lisp::Parser parser; @@ -784,8 +787,9 @@ bool process_load_game_menu() std::stringstream stream; stream << slot; - std::string slotfile = user_dir + "/save/slot" + stream.str() + ".stsg"; + std::string slotfile = "save/slot" + stream.str() + ".stsg"; + sound_manager->stop_music(); fadeout(256); DrawingContext context; context.draw_text(white_text, "Loading...",