X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fflip_level_transformer.cpp;h=0ac4816236d899be7c8675f63f1883dc00e55115;hb=36266bca23c8ef1a4b036572b7c5fa07df7a1afd;hp=db5a693a43ca70072dac9d945554e0f46c2ef101;hpb=9599042661b468aae7bd34dca05441c0ebc93ad7;p=supertux.git

diff --git a/src/flip_level_transformer.cpp b/src/flip_level_transformer.cpp
index db5a693a4..0ac481623 100644
--- a/src/flip_level_transformer.cpp
+++ b/src/flip_level_transformer.cpp
@@ -1,10 +1,31 @@
+//  $Id$
+// 
+//  SuperTux
+//  Copyright (C) 2005 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 "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"
 
 void
 FlipLevelTransformer::transform_sector(Sector* sector)
@@ -20,20 +41,29 @@ FlipLevelTransformer::transform_sector(Sector* sector)
     if(tilemap) {
       transform_tilemap(tilemap);
     }
+    Player* player = dynamic_cast<Player*> (object);
+    if(player) {
+      Vector pos = player->get_pos();
+      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);
-    } else {
-      MovingObject* mobject = dynamic_cast<MovingObject*> (object);
-      if(mobject) {
-        transform_moving_object(height, mobject);
-      }
+    }
+    MovingObject* mobject = dynamic_cast<MovingObject*> (object);
+    if(mobject) {
+      transform_moving_object(height, mobject);
     }
   }
   for(Sector::SpawnPoints::iterator i = sector->spawnpoints.begin();
       i != sector->spawnpoints.end(); ++i) {
     transform_spawnpoint(height, *i);
   }
+
+  if(sector->camera != 0 && sector->player != 0)
+    sector->camera->reset(sector->player->get_pos());
 }
 
 void
@@ -49,7 +79,11 @@ FlipLevelTransformer::transform_tilemap(TileMap* tilemap)
       tilemap->change(x, y2, t1->getID());
     }
   }
-  tilemap->set_drawing_effect(VERTICAL_FLIP);
+  if(tilemap->get_drawing_effect() != 0) {
+    tilemap->set_drawing_effect(0);
+  } else {
+    tilemap->set_drawing_effect(VERTICAL_FLIP);
+  }
 }
 
 void
@@ -71,8 +105,8 @@ FlipLevelTransformer::transform_spawnpoint(float height, SpawnPoint* spawn)
 void
 FlipLevelTransformer::transform_moving_object(float height, MovingObject*object)
 {
-  Vector pos = object->bbox.p1;
-  pos.y = height - pos.y;
-  object->bbox.set_pos(pos);
+  Vector pos = object->get_pos();
+  pos.y = height - pos.y - object->get_bbox().get_height();
+  object->set_pos(pos);
 }