Pause music when pressing ESC during a level and resume it when exiting the pause...

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

diff --git a/src/supertux/moving_object.hpp b/src/supertux/moving_object.hpp
index 7642ac5..07984eb 100644 (file)
--- a/src/supertux/moving_object.hpp
+++ b/src/supertux/moving_object.hpp
@@ -157,9 +157,9 @@ 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,
@@ -175,7 +175,7 @@ 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 */
   Rectf dest;