X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fflip_level_transformer.cpp;h=228c6200a0799aacbe1e846e76d13a570a3cb26c;hb=3da5eb5cc8f63053aaebb48cb2fffbed66f30d47;hp=3fafbd5cc567c89d6e4fe9b24db52f68adb255d0;hpb=aec32b2eca58fcbe1a2730d79d500a44cf9043f1;p=supertux.git

diff --git a/src/flip_level_transformer.cpp b/src/flip_level_transformer.cpp
index 3fafbd5cc..228c6200a 100644
--- a/src/flip_level_transformer.cpp
+++ b/src/flip_level_transformer.cpp
@@ -1,7 +1,7 @@
 //  $Id$
-// 
+//
 //  SuperTux
-//  Copyright (C) 2005 Matthias Braun <matze@braunis.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
@@ -12,20 +12,20 @@
 //  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 "flip_level_transformer.h"
-#include "object/tilemap.h"
-#include "object/camera.h"
-#include "badguy/badguy.h"
-#include "sector.h"
-#include "tile_manager.h"
-#include "spawn_point.h"
+#include "flip_level_transformer.hpp"
+#include "object/tilemap.hpp"
+#include "object/camera.hpp"
+#include "badguy/badguy.hpp"
+#include "sector.hpp"
+#include "tile_manager.hpp"
+#include "spawn_point.hpp"
 
 void
 FlipLevelTransformer::transform_sector(Sector* sector)
@@ -44,16 +44,14 @@ FlipLevelTransformer::transform_sector(Sector* sector)
     Player* player = dynamic_cast<Player*> (object);
     if(player) {
       Vector pos = player->get_pos();
-      pos.y = height - pos.y;
+      pos.y = height - pos.y - player->get_bbox().get_height();
       player->move(pos);
       continue;
     }
     BadGuy* badguy = dynamic_cast<BadGuy*> (object);
     if(badguy) {
       transform_badguy(height, badguy);
-      continue;
     }
-    
     MovingObject* mobject = dynamic_cast<MovingObject*> (object);
     if(mobject) {
       transform_moving_object(height, mobject);
@@ -82,7 +80,7 @@ FlipLevelTransformer::transform_tilemap(TileMap* tilemap)
     }
   }
   if(tilemap->get_drawing_effect() != 0) {
-    tilemap->set_drawing_effect(0);
+    tilemap->set_drawing_effect(NO_EFFECT);
   } else {
     tilemap->set_drawing_effect(VERTICAL_FLIP);
   }
@@ -108,7 +106,7 @@ void
 FlipLevelTransformer::transform_moving_object(float height, MovingObject*object)
 {
   Vector pos = object->get_pos();
-  pos.y = height - pos.y;
+  pos.y = height - pos.y - object->get_bbox().get_height();
   object->set_pos(pos);
 }