X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fflip_level_transformer.cpp;h=9208d7de5d2687621e31b55b549ec0ac92340b25;hb=47c58b6b5d40807eee7bd37fa2fd5d2188a333fd;hp=2d966de7acb77977b50856350ab552441c3a9d2a;hpb=1c148c20eede15d02659203c417d01a9877103de;p=supertux.git

diff --git a/src/flip_level_transformer.cpp b/src/flip_level_transformer.cpp
index 2d966de7a..9208d7de5 100644
--- a/src/flip_level_transformer.cpp
+++ b/src/flip_level_transformer.cpp
@@ -22,17 +22,19 @@
 #include "flip_level_transformer.hpp"
 #include "object/tilemap.hpp"
 #include "object/camera.hpp"
+#include "object/player.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;
@@ -56,6 +58,10 @@ FlipLevelTransformer::transform_sector(Sector* sector)
     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);
@@ -77,10 +83,10 @@ 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) {
@@ -114,7 +120,7 @@ FlipLevelTransformer::transform_moving_object(float height, MovingObject*object)
   object->set_pos(pos);
 }
 
-void 
+void
 FlipLevelTransformer::transform_platform(float height, Platform& platform)
 {
   Path& path = platform.get_path();
@@ -123,3 +129,9 @@ FlipLevelTransformer::transform_platform(float height, Platform& platform)
     pos.y = height - pos.y - platform.get_bbox().get_height();
   }
 }
+
+void
+FlipLevelTransformer::transform_block(float height, Block& block)
+{
+  if (block.original_y != -1) block.original_y = height - block.original_y - block.get_bbox().get_height();
+}