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

diff --git a/src/flip_level_transformer.cpp b/src/flip_level_transformer.cpp
index 3fafbd5cc..8cb5ff6d0 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,27 +12,28 @@
 //  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"
+#include "object/platform.hpp"
+#include "object/block.hpp"
 
 void
 FlipLevelTransformer::transform_sector(Sector* sector)
 {
-  float height = sector->solids->get_height() 
-    * sector->solids->get_tilemanager()->get_default_height();
-  
+  float height = sector->get_height();
+
   for(Sector::GameObjects::iterator i = sector->gameobjects.begin();
       i != sector->gameobjects.end(); ++i) {
     GameObject* object = *i;
@@ -44,16 +45,22 @@ 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;
     }
-    
+    Platform* platform = dynamic_cast<Platform*> (object);
+    if(platform) {
+      transform_platform(height, *platform);
+    }
+    Block* block = dynamic_cast<Block*> (object);
+    if(block) {
+      transform_block(height, *block);
+    }
     MovingObject* mobject = dynamic_cast<MovingObject*> (object);
     if(mobject) {
       transform_moving_object(height, mobject);
@@ -75,14 +82,14 @@ FlipLevelTransformer::transform_tilemap(TileMap* tilemap)
     for(size_t y = 0; y < tilemap->get_height()/2; ++y) {
       // swap tiles
       int y2 = tilemap->get_height()-1-y;
-      const Tile* t1 = tilemap->get_tile(x, y);
-      const Tile* t2 = tilemap->get_tile(x, y2);
-      tilemap->change(x, y, t2->getID());
-      tilemap->change(x, y2, t1->getID());
+      uint32_t t1 = tilemap->get_tile_id(x, y);
+      uint32_t t2 = tilemap->get_tile_id(x, y2);
+      tilemap->change(x, y, t2);
+      tilemap->change(x, y2, t1);
     }
   }
   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 +115,22 @@ 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);
 }
 
+void
+FlipLevelTransformer::transform_platform(float height, Platform& platform)
+{
+  Path& path = platform.get_path();
+  for (std::vector<Path::Node>::iterator i = path.nodes.begin(); i != path.nodes.end(); i++) {
+    Vector& pos = i->position;
+    pos.y = height - pos.y - platform.get_bbox().get_height();
+  }
+}
+
+void
+FlipLevelTransformer::transform_block(float height, Block& block)
+{
+  block.original_y = height - block.original_y - block.get_bbox().get_height();
+}