* The "time needed" statistic now works again. You might need to delete your savegame...

[supertux.git] / src / moving_object.hpp

diff --git a/src/moving_object.hpp b/src/moving_object.hpp
index 753914b..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"
@@ -27,6 +29,18 @@
 class Sector;
 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,
+  
+  COLGROUP_TILEMAP /* not really used at the moment */
+};
+
 /**
  * Base class for all dynamic/moving game objects. This class contains things
  * for handling the bounding boxes and collision feedback.
@@ -41,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
   {
@@ -66,6 +85,16 @@ public:
   {
     bbox.set_pos(pos);
   }
+
+  CollisionGroup get_group() const
+  {
+    return group;
+  }
+
+  void set_group(CollisionGroup group)
+  {
+    this->group = group;
+  }
   
 protected:
   friend class Sector;
@@ -79,6 +108,8 @@ protected:
   /** The movement that will happen till next frame
    */
   Vector movement;
+  /** The collision group */
+  CollisionGroup group;
 };
 
 #endif