summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/mapdef.cc
diff options
context:
space:
mode:
authorDavid Lawrence Ramsey <dolorous@users.sourceforge.net>2009-10-31 09:50:19 -0500
committerDavid Lawrence Ramsey <dolorous@users.sourceforge.net>2009-10-31 09:50:19 -0500
commit7b790d22c688d823ad37d6c2edb26e129d041a06 (patch)
tree50d8e5d9f64d7b9e8b17970184a9f4996850f4c5 /crawl-ref/source/mapdef.cc
parentd7c6fd9aec5ddd130a171adfaede50666f31a326 (diff)
downloadcrawl-ref-7b790d22c688d823ad37d6c2edb26e129d041a06.tar.gz
crawl-ref-7b790d22c688d823ad37d6c2edb26e129d041a06.zip
Add minor cosmetic fixes.
Diffstat (limited to 'crawl-ref/source/mapdef.cc')
-rw-r--r--crawl-ref/source/mapdef.cc26
1 files changed, 13 insertions, 13 deletions
diff --git a/crawl-ref/source/mapdef.cc b/crawl-ref/source/mapdef.cc
index 9678d68edc..0ca0a7a951 100644
--- a/crawl-ref/source/mapdef.cc
+++ b/crawl-ref/source/mapdef.cc
@@ -2172,7 +2172,7 @@ int mons_list::fix_demon(int demon) const
demon = -100 - demon;
- return (summon_any_demon( static_cast<demon_class_type>(demon) ));
+ return (summon_any_demon(static_cast<demon_class_type>(demon)));
}
mons_spec mons_list::pick_monster(mons_spec_slot &slot)
@@ -2199,7 +2199,7 @@ mons_spec mons_list::pick_monster(mons_spec_slot &slot)
if (slot.fix_slot)
{
slot.mlist.clear();
- slot.mlist.push_back( pick );
+ slot.mlist.push_back(pick);
slot.fix_slot = false;
}
@@ -2211,23 +2211,23 @@ mons_spec mons_list::pick_monster(mons_spec_slot &slot)
mons_spec mons_list::get_monster(int index)
{
- if (index < 0 || index >= (int) mons.size())
- return mons_spec(RANDOM_MONSTER);
+ if (index < 0 || index >= (int)mons.size())
+ return (mons_spec(RANDOM_MONSTER));
- return (pick_monster( mons[index] ));
+ return (pick_monster(mons[index]));
}
mons_spec mons_list::get_monster(int slot_index, int list_index) const
{
- if (slot_index < 0 || slot_index >= (int) mons.size())
- return mons_spec(RANDOM_MONSTER);
+ if (slot_index < 0 || slot_index >= (int)mons.size())
+ return (mons_spec(RANDOM_MONSTER));
const mons_spec_list &list = mons[slot_index].mlist;
- if (list_index < 0 || list_index >= (int) list.size())
- return mons_spec(RANDOM_MONSTER);
+ if (list_index < 0 || list_index >= (int)list.size())
+ return (mons_spec(RANDOM_MONSTER));
- return list[list_index];
+ return (list[list_index]);
}
void mons_list::clear()
@@ -2547,7 +2547,7 @@ mons_spec mons_list::get_hydra_spec(const std::string &name) const
else
{
// Might be "two-headed hydra" type string.
- for (int i = 0; i <= 20; i++)
+ for (int i = 0; i <= 20; ++i)
if (number_in_words(i) == prefix)
{
nheads = i;
@@ -2566,7 +2566,7 @@ mons_spec mons_list::get_hydra_spec(const std::string &name) const
nheads = 20;
}
- return mons_spec(MONS_HYDRA, MONS_NO_MONSTER, nheads);
+ return (mons_spec(MONS_HYDRA, MONS_NO_MONSTER, nheads));
}
mons_spec mons_list::get_slime_spec(const std::string &name) const
@@ -2591,7 +2591,7 @@ mons_spec mons_list::get_slime_spec(const std::string &name) const
#endif
}
- return mons_spec(MONS_SLIME_CREATURE, MONS_NO_MONSTER, slime_size);
+ return (mons_spec(MONS_SLIME_CREATURE, MONS_NO_MONSTER, slime_size));
}
// Handle draconians specified as: