Fixed a Segmentation Fault when mr_iceblock was kicked into a brick containing coins...

[supertux.git] / src / supertux / moving_object.hpp

diff --git a/src/supertux/moving_object.hpp b/src/supertux/moving_object.hpp
index 422aee7..07984eb 100644 (file)
--- a/src/supertux/moving_object.hpp
+++ b/src/supertux/moving_object.hpp
@@ -19,7 +19,7 @@
 
 #include <stdint.h>
 
-#include "math/rect.hpp"
+#include "math/rectf.hpp"
 #include "supertux/collision_hit.hpp"
 #include "supertux/game_object.hpp"
 
@@ -110,7 +110,7 @@ public:
   }
 
   /** returns the bounding box of the Object */
-  const Rect& get_bbox() const
+  const Rectf& get_bbox() const
   {
     return bbox;
   }
@@ -157,14 +157,14 @@ protected:
   friend class CollisionGrid;
   friend class Platform;
 
-  void set_group(CollisionGroup group)
+  void set_group(CollisionGroup group_)
   {
-    this->group = group;
+    this->group = group_;
   }
 
   /** The bounding box of the object (as used for collision detection,
       this isn't necessarily the bounding box for graphics) */
-  Rect bbox;
+  Rectf bbox;
 
   /** The movement that will happen till next frame */
   Vector movement;
@@ -175,10 +175,10 @@ protected:
 private:
   /** this is only here for internal collision detection use (don't touch this
       from outside collision detection code)
-      
+
       This field holds the currently anticipated destination of the object
       during collision detection */
-  Rect dest;
+  Rectf dest;
 };
 
 #endif