supertux/collision.[ch]pp: Use "contrain_*" rather than "min_*" and "max_*".

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

diff --git a/src/supertux/collision.hpp b/src/supertux/collision.hpp
index 14d15b0..01f3317 100644 (file)
--- a/src/supertux/collision.hpp
+++ b/src/supertux/collision.hpp
@@ -65,10 +65,10 @@ public:
   float top;
   float bottom;
 
-  void max_left  (float left2  ) { left   = std::max(left  , left2  ); }
-  void min_right (float right2 ) { right  = std::min(right , right2 ); }
-  void max_top   (float top2   ) { top    = std::max(top   , top2   ); }
-  void min_bottom(float bottom2) { bottom = std::min(bottom, bottom2); }
+  void constrain_left  (float left2  ) { left   = std::max(left  , left2  ); }
+  void constrain_right (float right2 ) { right  = std::min(right , right2 ); }
+  void constrain_top   (float top2   ) { top    = std::max(top   , top2   ); }
+  void constrain_bottom(float bottom2) { bottom = std::min(bottom, bottom2); }
 
   Vector ground_movement;
   CollisionHit hit;