From: Mathnerd314 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.verplant.org/?a=commitdiff_plain;h=f9ce3664e136b703959f75a23c6f75ddee6331a0;p=supertux.git Rename ACTIVATION_DISTANCE to get compile_amalgation to work again SVN-Revision: 6617 --- 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;