Massive copyright update. I'm sorry if I'm crediting Matze for something he didn...

[supertux.git] / src / game_session.cpp

diff --git a/src/game_session.cpp b/src/game_session.cpp
index 072e233..6b9a797 100644 (file)
--- a/src/game_session.cpp
+++ b/src/game_session.cpp
@@ -1,9 +1,7 @@
 //  $Id$
-// 
+//
 //  SuperTux
-//  Copyright (C) 2000 Bill Kendrick <bill@newbreedsoftware.com>
-//  Copyright (C) 2004 Tobias Glaesser <tobi.web@gmx.de>
-//  Copyright (C) 2004 Ingo Ruhnke <grumbel@gmx.de>
+//  Copyright (C) 2006 Matthias Braun <matze@braunis.de>
 //
 //  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,7 @@
 #include <SDL.h>
 
 #include "game_session.hpp"
-#include "msg.hpp"
+#include "log.hpp"
 #include "worldmap.hpp"
 #include "mainloop.hpp"
 #include "video/screen.hpp"
@@ -55,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"
@@ -342,7 +339,7 @@ bool
 GameSession::consoleCommand(std::string command, std::vector<std::string>)
 {
   if (command == "foo") {
-    msg_info << "bar" << std::endl;
+    log_info << "bar" << std::endl;
     return true;
   }
 
@@ -379,7 +376,7 @@ GameSession::consoleCommand(std::string command, std::vector<std::string>)
     return true;
   }
   if (command == "whereami") {
-    msg_info << "You are at x " << tux.get_pos().x << ", y " << tux.get_pos().y << std::endl;
+    log_info << "You are at x " << tux.get_pos().x << ", y " << tux.get_pos().y << std::endl;
     return true;
   }
   if (command == "gotoend") {
@@ -400,7 +397,7 @@ GameSession::consoleCommand(std::string command, std::vector<std::string>)
     return true;
   }
   if (command == "camera") {
-    msg_info << "Camera is at " << Sector::current()->camera->get_translation().x << "," << Sector::current()->camera->get_translation().y << std::endl;
+    log_info << "Camera is at " << Sector::current()->camera->get_translation().x << "," << Sector::current()->camera->get_translation().y << std::endl;
     return true;
   }
   if (command == "quit") {
@@ -501,7 +498,7 @@ GameSession::update(float elapsed_time)
   if(newsector != "" && newspawnpoint != "") {
     Sector* sector = level->get_sector(newsector);
     if(sector == 0) {
-      msg_warning << "Sector '" << newsector << "' not found" << std::endl;
+      log_warning << "Sector '" << newsector << "' not found" << std::endl;
     }
     sector->activate(newspawnpoint);
     sector->play_music(LEVEL_MUSIC);
@@ -773,12 +770,12 @@ GameSession::start_sequence(const std::string& sequencename)
     }
   } else if(sequencename == "stoptux") {
     if(!end_sequence) {
-      msg_warning << "Final target reached without an active end sequence" << std::endl;
+      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 << "'" << std::endl;
+    log_warning << "Unknown sequence '" << sequencename << "'" << std::endl;
   }
 }