added radio images and removed intro background image

[supertux.git] / src / moving_object.hpp

diff --git a/src/moving_object.hpp b/src/moving_object.hpp
index 7117777..79e415b 100644 (file)
--- a/src/moving_object.hpp
+++ b/src/moving_object.hpp
@@ -19,6 +19,8 @@
 #ifndef SUPERTUX_MOVING_OBJECT_H
 #define SUPERTUX_MOVING_OBJECT_H
 
+#include <stdint.h>
+
 #include "game_object.hpp"
 #include "collision_hit.hpp"
 #include "math/vector.hpp"
@@ -30,6 +32,8 @@ class CollisionGrid;
 enum CollisionGroup {
   COLGROUP_DISABLED,
   COLGROUP_MOVING,
+  // moving object but don't collide against other moving objects
+  COLGROUP_MOVING_ONLY_STATIC,
   COLGROUP_STATIC,
   COLGROUP_MOVINGSTATIC,
   COLGROUP_TOUCHABLE,
@@ -51,6 +55,11 @@ public:
    */
   virtual HitResponse collision(GameObject& other,
                                 const CollisionHit& hit) = 0;
+  /** called when tiles with special attributes have been touched */
+  virtual void collision_tile(uint32_t tile_attributes)
+  {
+    (void) tile_attributes;
+  }
   
   const Vector& get_pos() const
   {