X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fgame_session.cpp;h=2abb68c5f5d3b37eaeb84a8dca8ab682a7898a4d;hb=fa4882876de63a2579e95530581d68def7ebf925;hp=9deb153380b40e8a36bfa018d93f48f6b02d496d;hpb=77d6c22146b06e5737b905795c8d7aab3f146527;p=supertux.git

diff --git a/src/game_session.cpp b/src/game_session.cpp
index 9deb15338..2abb68c5f 100644
--- a/src/game_session.cpp
+++ b/src/game_session.cpp
@@ -34,6 +34,7 @@
 
 #include "game_session.hpp"
 #include "log.hpp"
+#include "console.hpp"
 #include "worldmap/worldmap.hpp"
 #include "mainloop.hpp"
 #include "audio/sound_manager.hpp"
@@ -55,7 +56,6 @@
 #include "statistics.hpp"
 #include "timer.hpp"
 #include "options_menu.hpp"
-#include "object/fireworks.hpp"
 #include "textscroller.hpp"
 #include "control/codecontroller.hpp"
 #include "control/joystickkeyboardcontroller.hpp"
@@ -66,8 +66,13 @@
 #include "console.hpp"
 #include "flip_level_transformer.hpp"
 #include "trigger/secretarea_trigger.hpp"
+#include "trigger/sequence_trigger.hpp"
 #include "random_generator.hpp"
 #include "scripting/squirrel_util.hpp"
+#include "object/endsequence_walkright.hpp"
+#include "object/endsequence_walkleft.hpp"
+#include "object/endsequence_fireworks.hpp"
+#include "direction.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"
@@ -83,19 +88,19 @@ GameSession* GameSession::current_ = NULL;
 
 GameSession::GameSession(const std::string& levelfile_, Statistics* statistics)
   : level(0), currentsector(0),
-    end_sequence(NO_ENDSEQUENCE), end_sequence_controller(0),
+    end_sequence(0),
     levelfile(levelfile_), best_level_statistics(statistics),
     capture_demo_stream(0), playback_demo_stream(0), demo_controller(0),
     play_time(0)
 {
   current_ = this;
   currentsector = NULL;
-  
+
   game_pause = false;
 
   statistics_backdrop.reset(new Surface("images/engine/menu/score-backdrop.png"));
 
-  restart_level(true);
+  restart_level();
 
   game_menu.reset(new Menu());
   game_menu->add_label(_("Pause"));
@@ -107,10 +112,10 @@ GameSession::GameSession(const std::string& levelfile_, Statistics* statistics)
 }
 
 void
-GameSession::restart_level(bool fromBeginning)
+GameSession::restart_level()
 {
   game_pause   = false;
-  end_sequence = NO_ENDSEQUENCE;
+  end_sequence = 0;
 
   main_controller->reset();
 
@@ -122,8 +127,8 @@ GameSession::restart_level(bool fromBeginning)
   level->stats.total_badguys = level->get_total_badguys();
   level->stats.total_secrets = level->get_total_count<SecretAreaTrigger>();
   level->stats.reset();
+  if(reset_sector != "")level->stats.declare_invalid();
 
-  if (fromBeginning) reset_sector="";
   if(reset_sector != "") {
     currentsector = level->get_sector(reset_sector);
     if(!currentsector) {
@@ -138,7 +143,7 @@ GameSession::restart_level(bool fromBeginning)
       throw std::runtime_error("Couldn't find main sector");
     currentsector->activate("main");
   }
-  
+
   //levelintro();
 
   currentsector->play_music(LEVEL_MUSIC);
@@ -159,8 +164,6 @@ GameSession::~GameSession()
   delete playback_demo_stream;
   delete demo_controller;
 
-  delete end_sequence_controller;
-
   current_ = NULL;
 }
 
@@ -168,8 +171,8 @@ void
 GameSession::record_demo(const std::string& filename)
 {
   delete capture_demo_stream;
-  
-  capture_demo_stream = new std::ofstream(filename.c_str()); 
+
+  capture_demo_stream = new std::ofstream(filename.c_str());
   if(!capture_demo_stream->good()) {
     std::stringstream msg;
     msg << "Couldn't open demo file '" << filename << "' for writing.";
@@ -178,17 +181,36 @@ GameSession::record_demo(const std::string& filename)
   capture_file = filename;
 
   char buf[30];                            // save the seed in the demo file
-  sprintf(buf, "random_seed=%010d", config->random_seed);
+  snprintf(buf, sizeof(buf), "random_seed=%10d", config->random_seed);
   for (int i=0; i==0 || buf[i-1]; i++)
     capture_demo_stream->put(buf[i]);
 }
 
+int
+GameSession::get_demo_random_seed(const std::string& filename)
+{
+  std::istream* test_stream = new std::ifstream(filename.c_str());
+  if(test_stream->good()) {
+    char buf[30];                     // recall the seed from the demo file
+    int seed;
+    for (int i=0; i<30 && (i==0 || buf[i-1]); i++)
+      test_stream->get(buf[i]);
+    if (sscanf(buf, "random_seed=%10d", &seed) == 1) {
+      log_info << "Random seed " << seed << " from demo file" << std::endl;
+         return seed;
+    }
+    else
+      log_info << "Demo file contains no random number" << std::endl;
+  }
+  return 0;
+}
+
 void
 GameSession::play_demo(const std::string& filename)
 {
   delete playback_demo_stream;
   delete demo_controller;
-  
+
   playback_demo_stream = new std::ifstream(filename.c_str());
   if(!playback_demo_stream->good()) {
     std::stringstream msg;
@@ -200,25 +222,18 @@ GameSession::play_demo(const std::string& filename)
   demo_controller = new CodeController();
   tux.set_controller(demo_controller);
 
-  char buf[30];                            // recall the seed from the demo file
+  // skip over random seed, if it exists in the file
+  char buf[30];                            // ascii decimal seed
   int seed;
   for (int i=0; i<30 && (i==0 || buf[i-1]); i++)
     playback_demo_stream->get(buf[i]);
-  if (sscanf(buf, "random_seed=%010d", &seed) == 1) {
-    config->random_seed = seed;            // save where it will be used
-    log_info << "Taking random seed " << seed << " from demo file" <<std::endl;
-  }
-  else {
+  if (sscanf(buf, "random_seed=%010d", &seed) != 1)
     playback_demo_stream->seekg(0);     // old style w/o seed, restart at beg
-    log_info << "Demo file contains no random number" << std::endl;
-  }
 }
 
 void
 GameSession::levelintro()
 {
-  char str[60];
-
   sound_manager->stop_music();
 
   DrawingContext context;
@@ -235,18 +250,19 @@ GameSession::levelintro()
   }
 
 //  context.draw_text(gold_text, level->get_name(), Vector(SCREEN_WIDTH/2, 160),
-//      CENTER_ALLIGN, LAYER_FOREGROUND1);
+//      ALIGN_CENTER, LAYER_FOREGROUND1);
   context.draw_center_text(gold_text, level->get_name(), Vector(0, 160),
       LAYER_FOREGROUND1);
 
-  sprintf(str, "Coins: %d", player_status->coins);
-  context.draw_text(white_text, str, Vector(SCREEN_WIDTH/2, 210),
-      CENTER_ALLIGN, LAYER_FOREGROUND1);
+  std::stringstream ss_coins;
+  ss_coins << _("Coins") << ": " << player_status->coins;
+  context.draw_text(white_text, ss_coins.str(), Vector(SCREEN_WIDTH/2, 210),
+      ALIGN_CENTER, LAYER_FOREGROUND1);
 
   if((level->get_author().size()) && (level->get_author() != "SuperTux Team"))
     context.draw_text(white_small_text,
-      std::string(_("contributed by ")) + level->get_author(), 
-      Vector(SCREEN_WIDTH/2, 350), CENTER_ALLIGN, LAYER_FOREGROUND1);
+      std::string(_("contributed by ")) + level->get_author(),
+      Vector(SCREEN_WIDTH/2, 350), ALIGN_CENTER, LAYER_FOREGROUND1);
 
   if(best_level_statistics != NULL)
     best_level_statistics->draw_message_info(context, _("Best Level Statistics"));
@@ -257,8 +273,13 @@ GameSession::levelintro()
 void
 GameSession::on_escape_press()
 {
-  if(currentsector->player->is_dying() || end_sequence != NO_ENDSEQUENCE)
+  if(currentsector->player->is_dying() || end_sequence)
+  {
+    // Let the timers run out, we fast-forward them to force past a sequence
+    if (end_sequence) end_sequence->stop();
+    currentsector->player->dying_timer.start(FLT_EPSILON);
     return;   // don't let the player open the menu, when he is dying
+  }
 
   if(level->on_menukey_script != "") {
     std::istringstream in(level->on_menukey_script);
@@ -267,7 +288,7 @@ GameSession::on_escape_press()
     toggle_pause();
   }
 }
-  
+
 void
 GameSession::toggle_pause()
 {
@@ -314,26 +335,11 @@ GameSession::run_script(std::istream& in, const std::string& sourcename)
 void
 GameSession::process_events()
 {
-  Player& tux = *currentsector->player;
-
   // end of pause mode?
   if(!Menu::current() && game_pause) {
     game_pause = false;
   }
 
-  if (end_sequence != NO_ENDSEQUENCE) {
-    if(end_sequence_controller == 0) {
-      end_sequence_controller = new CodeController();
-      tux.set_controller(end_sequence_controller);
-    }
-
-    end_sequence_controller->press(Controller::RIGHT);
-    
-    if (int(last_x_pos) == int(tux.get_pos().x))
-      end_sequence_controller->press(Controller::JUMP);    
-    last_x_pos = tux.get_pos().x;
-  }
-
   // playback a demo?
   if(playback_demo_stream != 0) {
     demo_controller->update();
@@ -363,7 +369,7 @@ GameSession::process_events()
     capture_demo_stream ->put(main_controller->hold(Controller::RIGHT));
     capture_demo_stream ->put(main_controller->hold(Controller::UP));
     capture_demo_stream ->put(main_controller->hold(Controller::DOWN));
-    capture_demo_stream ->put(main_controller->hold(Controller::JUMP));   
+    capture_demo_stream ->put(main_controller->hold(Controller::JUMP));
     capture_demo_stream ->put(main_controller->hold(Controller::ACTION));
   }
 }
@@ -374,24 +380,14 @@ GameSession::check_end_conditions()
   Player* tux = currentsector->player;
 
   /* End of level? */
-  if(end_sequence && endsequence_timer.check()) {
+  if(end_sequence && end_sequence->is_done()) {
     finish(true);
-    return;
   } else if (!end_sequence && tux->is_dead()) {
-    if (player_status->coins < 0) { 
-      // No more coins: restart level from beginning
-      player_status->coins = 0;
-      restart_level(true);
-    } else { 
-      // Still has coins: restart level from last reset point
-      restart_level(false);
-    }
-    
-    return;
+    restart_level();
   }
 }
 
-void 
+void
 GameSession::draw(DrawingContext& context)
 {
   currentsector->draw(context);
@@ -406,9 +402,9 @@ GameSession::draw_pause(DrawingContext& context)
 {
   context.draw_filled_rect(
       Vector(0,0), Vector(SCREEN_WIDTH, SCREEN_HEIGHT),
-      Color(.2, .2, .2, .5), LAYER_FOREGROUND1);
+      Color(.2f, .2f, .2f, .5f), LAYER_FOREGROUND1);
 }
-  
+
 void
 GameSession::process_menu()
 {
@@ -445,15 +441,15 @@ GameSession::setup()
 void
 GameSession::update(float elapsed_time)
 {
+  // handle controller
+  if(main_controller->pressed(Controller::PAUSE_MENU))
+    on_escape_press();
+
   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);
@@ -470,15 +466,17 @@ GameSession::update(float elapsed_time)
   // 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()) {
-	play_time += elapsed_time; //TODO: make sure we don't count cutscene time
-        level->stats.time = play_time;
-        currentsector->update(elapsed_time);
+    if (!end_sequence) {
+      play_time += elapsed_time; //TODO: make sure we don't count cutscene time
+      level->stats.time = play_time;
+      currentsector->update(elapsed_time);
+    } else {
+      if (!end_sequence->is_tux_stopped()) {
+        currentsector->update(elapsed_time/2);
+      } else {
+        end_sequence->update(elapsed_time/2);
       }
-    } 
+    }
   }
 
   // update sounds
@@ -487,7 +485,7 @@ GameSession::update(float elapsed_time)
   /* Handle music: */
   if (end_sequence)
     return;
-  
+
   if(currentsector->player->invincible_timer.started()) {
     if(currentsector->player->invincible_timer.get_timeleft() <=
        TUX_INVINCIBLE_TIME_WARNING) {
@@ -509,7 +507,7 @@ GameSession::finish(bool win)
     if(WorldMap::current())
       WorldMap::current()->finished_level(level.get());
   }
-  
+
   main_loop->exit_screen();
 }
 
@@ -540,7 +538,7 @@ GameSession::display_info_box(const std::string& text)
 
   bool running = true;
   DrawingContext context;
-  
+
   while(running)  {
 
     // TODO make a screen out of this, another mainloop is ugly
@@ -573,38 +571,65 @@ GameSession::display_info_box(const std::string& text)
 void
 GameSession::start_sequence(const std::string& sequencename)
 {
-  if(sequencename == "endsequence" || sequencename == "fireworks") {
-    if(end_sequence)
-      return;
-
-    end_sequence = ENDSEQUENCE_RUNNING;
-    endsequence_timer.start(7.3);
-    last_x_pos = -1;
-    sound_manager->play_music("music/leveldone.ogg", false);
-    currentsector->player->invincible_timer.start(7.3);
-
-    // Stop all clocks.
-    for(std::vector<GameObject*>::iterator i = currentsector->gameobjects.begin();
-        i != currentsector->gameobjects.end(); ++i)
-    {
-      GameObject* obj = *i;
-
-      LevelTime* lt = dynamic_cast<LevelTime*> (obj);
-      if(lt)
-        lt->stop();
+  // handle special "stoptux" sequence
+  if (sequencename == "stoptux") {
+    if (!end_sequence) {
+      log_warning << "Final target reached without an active end sequence" << std::endl;
+      this->start_sequence("endsequence");
     }
+    if (end_sequence) end_sequence->stop_tux();
+    return;
+  }
 
-    if(sequencename == "fireworks") {
-      currentsector->add_object(new Fireworks());
+  // abort if a sequence is already playing
+  if (end_sequence) return;
+
+  if (sequencename == "endsequence") {
+
+    // Determine walking direction for Tux
+    /*float xst = 1.f, xend = 2.f;
+    for(std::vector<GameObject*>::iterator i = currentsector->gameobjects.begin(); i != currentsector->gameobjects.end(); i++) {
+      SequenceTrigger* st = dynamic_cast<SequenceTrigger*>(*i);
+      if(!st)
+	continue;
+      if(st->get_sequence_name() == "stoptux")
+	xend = st->get_pos().x;
+      else if(st->get_sequence_name() == "endsequence")
+	xst = st->get_pos().y;
     }
-  } else if(sequencename == "stoptux") {
-    if(!end_sequence) {
-      log_warning << "Final target reached without an active end sequence" << std::endl;
-      this->start_sequence("endsequence");
+
+    if (xst > xend) {
+      end_sequence = new EndSequenceWalkLeft();
+    } else {
+      end_sequence = new EndSequenceWalkRight();
+    }*/
+    if (currentsector->get_players()[0]->physic.get_velocity_x() < 0) {
+      end_sequence = new EndSequenceWalkLeft();
+    } else {
+      end_sequence = new EndSequenceWalkRight();
     }
-    end_sequence =  ENDSEQUENCE_WAITING;
-  } else {
-    log_warning << "Unknown sequence '" << sequencename << "'" << std::endl;
+  }
+  else if (sequencename == "fireworks") end_sequence = new EndSequenceFireworks();
+  else {
+    log_warning << "Unknown sequence '" << sequencename << "'. Ignoring." << std::endl;
+    return;
+  }
+
+  currentsector->add_object(end_sequence);
+  end_sequence->start();
+
+  sound_manager->play_music("music/leveldone.ogg", false);
+  currentsector->player->invincible_timer.start(10000.0f);
+
+  // Stop all clocks.
+  for(std::vector<GameObject*>::iterator i = currentsector->gameobjects.begin();
+		  i != currentsector->gameobjects.end(); ++i)
+  {
+    GameObject* obj = *i;
+
+    LevelTime* lt = dynamic_cast<LevelTime*> (obj);
+    if(lt)
+      lt->stop();
   }
 }
 
@@ -619,4 +644,3 @@ GameSession::drawstatus(DrawingContext& context)
     level->stats.draw_endseq_panel(context, best_level_statistics, statistics_backdrop.get());
   }
 }
-