Fixed Tux picking up dead BadGuys: Will no longer pick up objects in collision group...

[supertux.git] / src / moving_object.hpp

diff --git a/src/moving_object.hpp b/src/moving_object.hpp
index 22a8c3e..31f47ad 100644 (file)
--- a/src/moving_object.hpp
+++ b/src/moving_object.hpp
@@ -31,7 +31,7 @@ class CollisionGrid;
 
 enum CollisionGroup {
   /** Objects in DISABLED group are not tested for collisions */
-  COLGROUP_DISABLED,
+  COLGROUP_DISABLED = 0,
   /**
    * "default" is moving object. MovingObjects get tested against all other
    * objects and against other movingobjects
@@ -42,6 +42,8 @@ enum CollisionGroup {
    * MovingOnlyStatic objects), but is tested against all other objects.
    */
   COLGROUP_MOVING_ONLY_STATIC,
+  /** TODO write docu :-/ */
+  COLGROUP_MOVING_STATIC,
   /**
    * Doesn't move and isn't explicitely checked for collisions with other
    * objects (but other objects might check with this)
@@ -146,16 +148,16 @@ public:
     return group;
   }
 
-  void set_group(CollisionGroup group)
-  {
-    this->group = group;
-  }
-
 protected:
   friend class Sector;
   friend class CollisionGrid;
   friend class Platform;
 
+  void set_group(CollisionGroup group)
+  {
+    this->group = group;
+  }
+
   /** The bounding box of the object (as used for collision detection, this
    * isn't necessarily the bounding box for graphics)
    */