From: mathnerd314 <mathnerd314@837edb03-e0f3-0310-88ca-d4d4e8b29345>
Date: Sat, 20 Mar 2010 15:20:58 +0000 (+0000)
Subject: Rename ACTIVATION_DISTANCE to get compile_amalgation to work again
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=8f9981424f5d6c7f4cba6dfc73f3d46b98733664;p=supertux.git

Rename ACTIVATION_DISTANCE to get compile_amalgation to work again

git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6617 837edb03-e0f3-0310-88ca-d4d4e8b29345
---

diff --git a/src/object/icecrusher.cpp b/src/object/icecrusher.cpp
index 873428c14..2874d263a 100644
--- a/src/object/icecrusher.cpp
+++ b/src/object/icecrusher.cpp
@@ -27,7 +27,7 @@ namespace {
 /* Maximum movement speed in pixels per LOGICAL_FPS */
 const float MAX_DROP_SPEED = 10.0;
 const float RECOVER_SPEED = -3.125;
-const float ACTIVATION_DISTANCE = 4.0;
+const float DROP_ACTIVATION_DISTANCE = 4.0;
 const float PAUSE_TIME = 0.5;
 }
 
@@ -175,8 +175,8 @@ IceCrusher::found_victim()
   const Rectf& player_bbox = player->get_bbox();
   const Rectf& crusher_bbox = get_bbox();
   if ((player_bbox.p1.y >= crusher_bbox.p2.y) /* player is below crusher */
-      && (player_bbox.p2.x > (crusher_bbox.p1.x - ACTIVATION_DISTANCE))
-      && (player_bbox.p1.x < (crusher_bbox.p2.x + ACTIVATION_DISTANCE)))
+      && (player_bbox.p2.x > (crusher_bbox.p1.x - DROP_ACTIVATION_DISTANCE))
+      && (player_bbox.p1.x < (crusher_bbox.p2.x + DROP_ACTIVATION_DISTANCE)))
     return true;
   else
     return false;