X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fobject%2Fhurting_platform.cpp;h=84395b359cee92f987afd49bac31e6d99fb4ab3a;hb=b9a95f9ce5940051dec5dd5bfb936ee7e0bd4565;hp=59cbfdf80e492c50dfe38918c758d33b81d1cd4c;hpb=fea3446f05e1e7673607b835c269d3e8d1929ab3;p=supertux.git

diff --git a/src/object/hurting_platform.cpp b/src/object/hurting_platform.cpp
index 59cbfdf80..84395b359 100644
--- a/src/object/hurting_platform.cpp
+++ b/src/object/hurting_platform.cpp
@@ -1,12 +1,10 @@
-//  $Id$
-//
 //  SuperTux - Hurting Platform
 //  Copyright (C) 2006 Christoph Sommer <christoph.sommer@2006.expires.deltadevelopment.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 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 3 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
@@ -14,21 +12,16 @@
 //  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>
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#include "hurting_platform.hpp"
+#include "object/hurting_platform.hpp"
 
-#include "log.hpp"
-#include "player.hpp"
 #include "badguy/badguy.hpp"
-#include "object_factory.hpp"
+#include "object/player.hpp"
+#include "supertux/object_factory.hpp"
 
-HurtingPlatform::HurtingPlatform(const lisp::Lisp& reader)
-	: Platform(reader)
+HurtingPlatform::HurtingPlatform(const Reader& reader)
+  : Platform(reader)
 {
   set_group(COLGROUP_TOUCHABLE);
 }
@@ -38,6 +31,9 @@ HurtingPlatform::collision(GameObject& other, const CollisionHit& )
 {
   Player* player = dynamic_cast<Player*>(&other);
   if (player) {
+    if(player->is_invincible()) {
+      return ABORT_MOVE;
+    }
     player->kill(false);
   }
   BadGuy* badguy = dynamic_cast<BadGuy*>(&other);
@@ -48,4 +44,4 @@ HurtingPlatform::collision(GameObject& other, const CollisionHit& )
   return FORCE_MOVE;
 }
 
-IMPLEMENT_FACTORY(HurtingPlatform, "hurting_platform");
+/* EOF */