X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fobject%2Fanchor_point.cpp;h=4c42edb06a46d17f6b584fa8781e76527f4eca32;hb=a98f7cee9f6a2593c0e1f3442800f159bad410df;hp=c7f82ac9de18eb156273c970cfa32fcba2b5c706;hpb=0f0e6a3689e5d810ec55b68ff455210b1081a021;p=supertux.git

diff --git a/src/object/anchor_point.cpp b/src/object/anchor_point.cpp
index c7f82ac9d..4c42edb06 100644
--- a/src/object/anchor_point.cpp
+++ b/src/object/anchor_point.cpp
@@ -1,10 +1,29 @@
+//  $Id$
+//
+//  SuperTux
+//  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
+//  as published by the Free Software Foundation; either version 2
+//  of the License, or (at your option) any later version.
+//
+//  This program is distributed in the hope that it will be useful,
+//  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.
+
 #include <config.h>
 
 #include <stdexcept>
 #include <sstream>
 #include "anchor_point.hpp"
 #include "math/rect.hpp"
-#include "msg.hpp"
+#include "log.hpp"
 
 std::string anchor_point_to_string(AnchorPoint point)
 {
@@ -52,7 +71,7 @@ AnchorPoint string_to_anchor_point(const std::string& str)
     return ANCHOR_BOTTOM;
   else if(str == "bottomright")
     return ANCHOR_BOTTOM_RIGHT;
-    
+
   std::ostringstream msg;
   msg << "Unknown anchor '" << str << "'";
   throw std::runtime_error(msg.str());
@@ -61,7 +80,7 @@ AnchorPoint string_to_anchor_point(const std::string& str)
 Vector get_anchor_pos(const Rect& rect, AnchorPoint point)
 {
   Vector result;
-  
+
   switch(point & ANCHOR_V_MASK) {
     case ANCHOR_LEFT:
       result.x = rect.get_left();
@@ -74,9 +93,9 @@ Vector get_anchor_pos(const Rect& rect, AnchorPoint point)
       break;
     default:
 #ifdef DEBUG
-      throw new std::runtime_error("Invalid anchor point found");
+      throw std::runtime_error("Invalid anchor point found");
 #endif
-      msg_warning("Invalid anchor point found");
+      log_warning << "Invalid anchor point found" << std::endl;
       result.x = rect.get_left();
       break;
   }
@@ -93,13 +112,13 @@ Vector get_anchor_pos(const Rect& rect, AnchorPoint point)
       break;
     default:
 #ifdef DEBUG
-      throw new std::runtime_error("Invalid anchor point found");
+      throw std::runtime_error("Invalid anchor point found");
 #endif
-      msg_warning("Invalid anchor point found");
+      log_warning << "Invalid anchor point found" << std::endl;
       result.y = rect.get_top();
       break;
   }
-  
+
   return result;
 }
 
@@ -107,7 +126,7 @@ Vector get_anchor_pos(const Rect& destrect, float width, float height,
                       AnchorPoint point)
 {
   Vector result;
-  
+
   switch(point & ANCHOR_V_MASK) {
     case ANCHOR_LEFT:
       result.x = destrect.get_left();
@@ -120,9 +139,9 @@ Vector get_anchor_pos(const Rect& destrect, float width, float height,
       break;
     default:
 #ifdef DEBUG
-      throw new std::runtime_error("Invalid anchor point found");
+      throw std::runtime_error("Invalid anchor point found");
 #endif
-      msg_warning("Invalid anchor point found");
+      log_warning << "Invalid anchor point found" << std::endl;
       result.x = destrect.get_left();
       break;
   }
@@ -139,13 +158,12 @@ Vector get_anchor_pos(const Rect& destrect, float width, float height,
       break;
     default:
 #ifdef DEBUG
-      throw new std::runtime_error("Invalid anchor point found");
+      throw std::runtime_error("Invalid anchor point found");
 #endif
-      msg_warning("Invalid anchor point found");
+      log_warning << "Invalid anchor point found" << std::endl;
       result.y = destrect.get_top();
       break;
   }
-  
-  return result; 
-}
 
+  return result;
+}