support for centered text in scripts

[supertux.git] / src / object / rock.cpp

diff --git a/src/object/rock.cpp b/src/object/rock.cpp
index 2b45e60..0600b11 100644 (file)
--- a/src/object/rock.cpp
+++ b/src/object/rock.cpp
@@ -1,11 +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 "rock.h"
-#include "special/sprite.h"
-#include "special/sprite_manager.h"
-#include "lisp/writer.h"
-#include "video/drawing_context.h"
-#include "resources.h"
+#include "rock.hpp"
+#include "sprite/sprite.hpp"
+#include "sprite/sprite_manager.hpp"
+#include "lisp/writer.hpp"
+#include "video/drawing_context.hpp"
+#include "resources.hpp"
+#include "object_factory.hpp"
 
 Rock::Rock(const lisp::Lisp& reader)
 {
@@ -41,7 +61,7 @@ Rock::draw(DrawingContext& context)
 }
 
 void
-Rock::action(float elapsed_time)
+Rock::update(float elapsed_time)
 {
   if(!grabbed) {
     flags |= FLAG_SOLID;
@@ -57,13 +77,17 @@ Rock::action(float elapsed_time)
 }
 
 HitResponse
-Rock::collision(GameObject& , const CollisionHit& )
+Rock::collision(GameObject& object, const CollisionHit& )
 {
   if(grabbed)
     return FORCE_MOVE;
 
-  physic.set_velocity(0, 0);
-  return CONTINUE;
+  if(object.get_flags() & FLAG_SOLID) {
+      physic.set_velocity(0, 0);
+      return CONTINUE;
+  }
+
+  return FORCE_MOVE;
 }
 
 void
@@ -73,3 +97,5 @@ Rock::grab(MovingObject& , const Vector& pos)
   grabbed = true;
 }
 
+IMPLEMENT_FACTORY(Rock, "rock");
+