Changed collision code, we now have several collision groups:

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

diff --git a/src/object/rock.cpp b/src/object/rock.cpp
index f53ea21..e6862f3 100644 (file)
--- a/src/object/rock.cpp
+++ b/src/object/rock.cpp
@@ -19,13 +19,13 @@
 //  02111-1307, USA.
 #include <config.h>
 
-#include "rock.h"
-#include "sprite/sprite.h"
-#include "sprite/sprite_manager.h"
-#include "lisp/writer.h"
-#include "video/drawing_context.h"
-#include "resources.h"
-#include "object_factory.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)
 {
@@ -65,12 +65,12 @@ Rock::update(float elapsed_time)
 {
   if(!grabbed) {
     flags |= FLAG_SOLID;
-    flags &= ~FLAG_NO_COLLDET;
+    set_group(COLGROUP_STATIC);
     movement = physic.get_movement(elapsed_time);
   } else {
     physic.set_velocity(0, 0);
     flags &= ~FLAG_SOLID;
-    flags |= FLAG_NO_COLLDET;
+    set_group(COLGROUP_DISABLED);
   }
   
   grabbed = false;