Shatter shards on impact

Makes shards less annoying. With this change, there is no need for them
to be a sticky object, a moving sprite is just enough and makes them
less complex.

Fixes SuperTux#3134

Author: Brockengespenst

src/object/shard.cpp

@@ -25,18 +25,16 @@
 #include "util/reader_mapping.hpp"
 
 Shard::Shard(const ReaderMapping& reader) :
-  StickyObject(reader, "images/creatures/crystallo/shard.sprite", LAYER_TILES - 2, COLGROUP_MOVING),
-  m_physic(),
-  m_stick_timer()
+  MovingSprite(reader, "images/creatures/crystallo/shard.sprite", LAYER_TILES - 2, COLGROUP_MOVING),
+  m_physic()
 {
   m_physic.enable_gravity(true);
   SoundManager::current()->preload("sounds/crystallo-shardhit.ogg");
 }
 
 Shard::Shard(const Vector& pos, const Vector& velocity, const std::string& sprite) :
-  StickyObject(pos, sprite, LAYER_TILES - 2, COLGROUP_MOVING),
-  m_physic(),
-  m_stick_timer()
+  MovingSprite(pos, sprite, LAYER_TILES - 2, COLGROUP_MOVING),
+  m_physic()
 {
   m_physic.enable_gravity(true);
   m_physic.set_velocity(velocity);
@@ -47,29 +45,19 @@ Shard::Shard(const Vector& pos, const Vector& velocity, const std::string& sprit
 void
 Shard::update(float dt_sec)
 {
-  m_sticky = true;
-
-  if (m_physic.get_velocity() != Vector(0.f, 0.f) && !m_sticking)
+  if (m_physic.get_velocity() != Vector(0.f, 0.f))
     m_sprite->set_angle(math::degrees(math::angle(Vector(m_physic.get_velocity_x(), m_physic.get_velocity_y()))));
-  if (m_stick_timer.check())
-    remove_me();
 
   m_col.set_movement(m_physic.get_movement(dt_sec));
 
-  StickyObject::update(dt_sec);
+  MovingSprite::update(dt_sec);
 }
 
 void
 Shard::collision_solid(const CollisionHit& hit)
 {
-  m_physic.set_velocity(0.f, 0.f);
-  m_physic.set_acceleration(0.f, 0.f);
-  m_physic.enable_gravity(hit.bottom);
-  if (!m_stick_timer.started())
-  {
-    m_stick_timer.start(5.f);
-    SoundManager::current()->play("sounds/crystallo-shardhit.ogg", get_pos());
-  }
+  SoundManager::current()->play("sounds/crystallo-shardhit.ogg", get_pos());
+  remove_me();
 }
 
 HitResponse
@@ -82,11 +70,17 @@ Shard::collision(MovingObject& other, const CollisionHit&)
   // kill badguys
   auto badguy = dynamic_cast<BadGuy*>(&other);
   if (badguy != nullptr)
+  {
     badguy->kill_fall();
+    remove_me();
+  }
   // kill players
   auto player = dynamic_cast<Player*>(&other);
   if (player != nullptr)
+  {
     player->kill(false);
+    remove_me();
+  }
   return ABORT_MOVE;
 }
 

src/object/shard.hpp

@@ -17,11 +17,11 @@
 #ifndef HEADER_SUPERTUX_OBJECT_SHARD_HPP
 #define HEADER_SUPERTUX_OBJECT_SHARD_HPP
 
-#include "object/sticky_object.hpp"
+#include "object/moving_sprite.hpp"
 #include "supertux/physic.hpp"
 #include "supertux/timer.hpp"
 
-class Shard final : public StickyObject
+class Shard final : public MovingSprite
 {
 public:
   Shard(const ReaderMapping& reader);
@@ -34,14 +34,11 @@ class Shard final : public StickyObject
   virtual std::string get_class_name() const override { return class_name(); }
   static std::string display_name() { return _("Shard"); }
   virtual std::string get_display_name() const override { return display_name(); }
-  virtual GameObjectClasses get_class_types() const override { return StickyObject::get_class_types().add(typeid(Shard)); }
+  virtual GameObjectClasses get_class_types() const override { return MovingSprite::get_class_types().add(typeid(Shard)); }
 
 protected:
   Physic m_physic;
 
-private:
-  Timer m_stick_timer;
-
 private:
   Shard(const Shard&) = delete;
   Shard& operator=(const Shard&) = delete;