fix growup, lightmap experiments with willowisp

[supertux.git] / src / game_session.cpp

diff --git a/src/game_session.cpp b/src/game_session.cpp
index 14a69d6..e96f821 100644 (file)
--- a/src/game_session.cpp
+++ b/src/game_session.cpp
@@ -20,7 +20,6 @@
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <config.h>
 
-#include <iostream>
 #include <fstream>
 #include <sstream>
 #include <cassert>
@@ -36,6 +35,7 @@
 #include <SDL.h>
 
 #include "game_session.hpp"
+#include "msg.hpp"
 #include "video/screen.hpp"
 #include "audio/sound_manager.hpp"
 #include "gui/menu.hpp"
@@ -369,7 +369,7 @@ GameSession::try_cheats()
     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;
+    msg_info("You are at x " << tux.get_pos().x << ", y " << tux.get_pos().y);
   }
 #if 0
   if(main_controller->check_cheatcode("grid")) {
@@ -393,6 +393,11 @@ GameSession::try_cheats()
     exit_status = ES_LEVEL_FINISHED;
     // don't add points to stats though...
   }
+  if(main_controller->check_cheatcode("camera")) {
+    msg_info("Camera is at " 
+              << Sector::current()->camera->get_translation().x << "," 
+              << Sector::current()->camera->get_translation().y);
+  }
 }
 
 void
@@ -454,7 +459,7 @@ GameSession::update(float elapsed_time)
   if(newsector != "" && newspawnpoint != "") {
     Sector* sector = level->get_sector(newsector);
     if(sector == 0) {
-      std::cerr << "Sector '" << newsector << "' not found.\n";
+      msg_warning("Sector '" << newsector << "' not found");
     }
     sector->activate(newspawnpoint);
     sector->play_music(LEVEL_MUSIC);
@@ -716,19 +721,19 @@ GameSession::start_sequence(const std::string& sequencename)
   if(sequencename == "endsequence" || sequencename == "fireworks") {
     if(end_sequence)
       return;
-    
+
     end_sequence = ENDSEQUENCE_RUNNING;
-    endsequence_timer.start(level->extro_length);
+    endsequence_timer.start(7.3);
     last_x_pos = -1;
-    sound_manager->play_music("music/" + level->extro_music, false);
-    currentsector->player->invincible_timer.start(level->extro_length);
+    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();
@@ -739,13 +744,13 @@ GameSession::start_sequence(const std::string& sequencename)
     }
   } else if(sequencename == "stoptux") {
     if(!end_sequence) {
-      std::cout << "WARNING: Final target reached without "
-        << "an active end sequence." << std::endl;
+      msg_warning("Final target reached without "
+        << "an active end sequence");
       this->start_sequence("endsequence");
     }
     end_sequence =  ENDSEQUENCE_WAITING;
   } else {
-    std::cout << "Unknown sequence '" << sequencename << "'.\n";
+    msg_warning("Unknown sequence '" << sequencename << "'");
   }
 }