summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/shout.cc
diff options
context:
space:
mode:
authorDracoOmega <draco_omega@live.com>2013-03-05 15:01:20 -0330
committerDracoOmega <draco_omega@live.com>2013-03-06 01:38:13 -0330
commite2e8a398e699175ec37813b621098e3f5e210a2c (patch)
tree1065fdd5c84a930ce809407e4a2af67b5219f130 /crawl-ref/source/shout.cc
parentf4a4332a4b5c1120a31c009680ab2e162ffb68ab (diff)
downloadcrawl-ref-e2e8a398e699175ec37813b621098e3f5e210a2c.tar.gz
crawl-ref-e2e8a398e699175ec37813b621098e3f5e210a2c.zip
Make a function public and rename
Diffstat (limited to 'crawl-ref/source/shout.cc')
-rw-r--r--crawl-ref/source/shout.cc9
1 files changed, 1 insertions, 8 deletions
diff --git a/crawl-ref/source/shout.cc b/crawl-ref/source/shout.cc
index f85476ade4..f15c1ebaa1 100644
--- a/crawl-ref/source/shout.cc
+++ b/crawl-ref/source/shout.cc
@@ -954,13 +954,6 @@ void noise_grid::apply_noise_effects(const coord_def &pos,
}
}
-static coord_def _point_clamped_in_bounds(const coord_def &p)
-{
- return coord_def(
- min(X_BOUND_2 - 1, max(X_BOUND_1 + 1, p.x)),
- min(Y_BOUND_2 - 1, max(Y_BOUND_1 + 1, p.y)));
-}
-
// Given an actor at affected_pos and a given noise, calculates where
// the actor might think the noise originated.
//
@@ -1024,7 +1017,7 @@ coord_def noise_grid::noise_perceived_position(actor *act,
const coord_def final_perceived_point =
!in_bounds(perceived_point)?
- _point_clamped_in_bounds(perceived_point)
+ clamp_in_bounds(perceived_point)
: perceived_point;
#ifdef DEBUG_NOISE_PROPAGATION