summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/tilereg-dgn.cc
diff options
context:
space:
mode:
authorAdam Borowski <kilobyte@angband.pl>2012-06-26 11:24:14 +0200
committerAdam Borowski <kilobyte@angband.pl>2012-06-26 11:24:14 +0200
commit403d3f9bb4977205216be8a5d32526f9d91de168 (patch)
tree6c1c56c7f0c33beecffce4d9a2598d71978575d4 /crawl-ref/source/tilereg-dgn.cc
parent47a8935d7344bcb8e316d8b8265ababa51ac09ba (diff)
downloadcrawl-ref-403d3f9bb4977205216be8a5d32526f9d91de168.tar.gz
crawl-ref-403d3f9bb4977205216be8a5d32526f9d91de168.zip
Don't use two misleading schemes for reach ranges.
Both were scalars compatible with int, and both used the name "reach_range" is some cases. Thus, let's use 2/5/8 everywhere. This probably makes the enum obsolete.
Diffstat (limited to 'crawl-ref/source/tilereg-dgn.cc')
-rw-r--r--crawl-ref/source/tilereg-dgn.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/crawl-ref/source/tilereg-dgn.cc b/crawl-ref/source/tilereg-dgn.cc
index b534de41f4..d4cb1483af 100644
--- a/crawl-ref/source/tilereg-dgn.cc
+++ b/crawl-ref/source/tilereg-dgn.cc
@@ -703,7 +703,7 @@ static bool _handle_distant_monster(monster* mon, unsigned char mod)
{
const int dist = (you.pos() - mon->pos()).abs();
- if (dist > 2 && weapon && reach_range(weapon_reach(*weapon)) >= dist)
+ if (dist > 2 && weapon && weapon_reach(*weapon) >= dist)
{
macro_buf_add_cmd(CMD_EVOKE_WIELDED);
_add_targetting_commands(mon->pos());
@@ -1055,7 +1055,7 @@ static void _add_tip(std::string &tip, std::string text)
bool tile_dungeon_tip(const coord_def &gc, std::string &tip)
{
const int attack_dist = you.weapon() ?
- reach_range(weapon_reach(*you.weapon())) : 2;
+ weapon_reach(*you.weapon()) : 2;
std::vector<command_type> cmd;
tip = "";