summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/mon-transit.cc
diff options
context:
space:
mode:
authorAdam Borowski <kilobyte@angband.pl>2012-07-05 12:14:09 +0200
committerAdam Borowski <kilobyte@angband.pl>2012-07-05 12:14:09 +0200
commitc41419c4f47bbf0737d3fedf58128c835d2c4e3b (patch)
tree764ae18c107df39fd90af718922036bd245561ca /crawl-ref/source/mon-transit.cc
parentb80adef8882143cad34f3c8bcc9a8ccbd4440223 (diff)
downloadcrawl-ref-c41419c4f47bbf0737d3fedf58128c835d2c4e3b.tar.gz
crawl-ref-c41419c4f47bbf0737d3fedf58128c835d2c4e3b.zip
Drop parentheses around scalar values in "return".
Diffstat (limited to 'crawl-ref/source/mon-transit.cc')
-rw-r--r--crawl-ref/source/mon-transit.cc26
1 files changed, 13 insertions, 13 deletions
diff --git a/crawl-ref/source/mon-transit.cc b/crawl-ref/source/mon-transit.cc
index 69389a72ff..2fc0ad977f 100644
--- a/crawl-ref/source/mon-transit.cc
+++ b/crawl-ref/source/mon-transit.cc
@@ -260,11 +260,11 @@ bool follower::place(bool near_player)
m->flags |= MF_JUST_SUMMONED;
restore_mons_items(*m);
env.mid_cache[m->mid] = m->mindex();
- return (true);
+ return true;
}
m->reset();
- return (false);
+ return false;
}
void follower::restore_mons_items(monster& m)
@@ -297,22 +297,22 @@ static bool _is_religious_follower(const monster* mon)
static bool _tag_follower_at(const coord_def &pos, bool &real_follower)
{
if (!in_bounds(pos) || pos == you.pos())
- return (false);
+ return false;
monster* fol = monster_at(pos);
if (fol == NULL)
- return (false);
+ return false;
if (!fol->alive()
|| fol->speed_increment < 50
|| fol->incapacitated()
|| mons_is_stationary(fol))
{
- return (false);
+ return false;
}
if (!monster_habitable_grid(fol, DNGN_FLOOR))
- return (false);
+ return false;
// Only non-wandering friendly monsters or those actively
// seeking the player will follow up/down stairs.
@@ -320,7 +320,7 @@ static bool _tag_follower_at(const coord_def &pos, bool &real_follower)
&& (!mons_is_seeking(fol) || fol->foe != MHITYOU)
|| fol->foe == MHITNOT)
{
- return (false);
+ return false;
}
// Monsters that are not directly adjacent are subject to more
@@ -328,12 +328,12 @@ static bool _tag_follower_at(const coord_def &pos, bool &real_follower)
if ((pos - you.pos()).abs() > 2)
{
if (!fol->friendly())
- return (false);
+ return false;
// Undead will follow Yredelemnul worshippers, and orcs will
// follow Beogh worshippers.
if (!_is_religious_follower(fol))
- return (false);
+ return false;
}
// Monsters that can't use stairs can still be marked as followers
@@ -344,9 +344,9 @@ static bool _tag_follower_at(const coord_def &pos, bool &real_follower)
if (_is_religious_follower(fol))
{
fol->flags |= MF_TAKING_STAIRS;
- return (true);
+ return true;
}
- return (false);
+ return false;
}
real_follower = true;
@@ -364,7 +364,7 @@ static bool _tag_follower_at(const coord_def &pos, bool &real_follower)
dprf("%s is marked for following.",
fol->name(DESC_THE, true).c_str());
- return (true);
+ return true;
}
static int follower_tag_radius2()
@@ -375,7 +375,7 @@ static int follower_tag_radius2()
{
if (const monster* mon = monster_at(*ai))
if (!mon->friendly())
- return (2);
+ return 2;
}
return (6 * 6);