Reworked Thunderstorm scripting

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

diff --git a/src/object/rock.cpp b/src/object/rock.cpp
index 2df1586..1ffa231 100644 (file)
--- a/src/object/rock.cpp
+++ b/src/object/rock.cpp
@@ -20,27 +20,16 @@
 #include <config.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)
+       : MovingSprite(reader, "images/objects/rock/rock.sprite", LAYER_OBJECTS+1, COLGROUP_STATIC)
 {
-  reader.get("x", bbox.p1.x);
-  reader.get("y", bbox.p1.y);
-  bbox.set_size(31.8, 31.8);
-  sprite = sprite_manager->create("images/objects/rock/rock.sprite");
   grabbed = false;
   flags |= FLAG_SOLID | FLAG_PORTABLE;
-  set_group(COLGROUP_MOVING);
-}
-
-Rock::~Rock()
-{
-  delete sprite;
 }
 
 void
@@ -55,17 +44,11 @@ Rock::write(lisp::Writer& writer)
 }
 
 void
-Rock::draw(DrawingContext& context)
-{
-  sprite->draw(context, get_pos(), LAYER_OBJECTS+1);
-}
-
-void
 Rock::update(float elapsed_time)
 {
   if(!grabbed) {
     flags |= FLAG_SOLID;
-    set_group(COLGROUP_MOVING);
+    set_group(COLGROUP_STATIC);
     movement = physic.get_movement(elapsed_time);
   } else {
     physic.set_velocity(0, 0);
@@ -81,19 +64,20 @@ Rock::update(float elapsed_time)
   */
 }
 
+void
+Rock::collision_solid(const CollisionHit& )
+{
+  physic.set_velocity(0, 0);
+}
+
 HitResponse
-Rock::collision(GameObject& object, const CollisionHit& )
+Rock::collision(GameObject& , const CollisionHit& )
 {
   if(grabbed) {
-    return FORCE_MOVE;
-  }
-
-  if(object.get_flags() & FLAG_SOLID) {
-    physic.set_velocity(0, 0);
-    return CONTINUE;
+    return PASSTHROUGH;
   }
 
-  return FORCE_MOVE;
+  return SOLID;
 }
 
 void