diff options
| -rw-r--r-- | crawl-ref/source/mapdef.cc | 10 | ||||
| -rw-r--r-- | crawl-ref/source/mapdef.h | 2 | ||||
| -rw-r--r-- | crawl-ref/source/mon-util.cc | 2 |
3 files changed, 8 insertions, 6 deletions
diff --git a/crawl-ref/source/mapdef.cc b/crawl-ref/source/mapdef.cc index 0ca0a7a951..8b0f28a90d 100644 --- a/crawl-ref/source/mapdef.cc +++ b/crawl-ref/source/mapdef.cc @@ -518,7 +518,7 @@ void map_lines::add_line(const std::string &s) std::string map_lines::clean_shuffle(std::string s) { - return replace_all_of(s, " \t", ""); + return (replace_all_of(s, " \t", "")); } std::string map_lines::check_block_shuffle(const std::string &s) @@ -614,10 +614,10 @@ bool map_colour_list::parse(const std::string &col, int weight) { const int colour = col == "none" ? BLACK : str_to_colour(col, -1); if (colour == -1) - return false; + return (false); push_back(map_weighted_colour(colour, weight)); - return true; + return (true); } std::string map_lines::add_colour(const std::string &sub) @@ -2725,10 +2725,10 @@ mons_spec mons_list::mons_by_name(std::string name) const return (MONS_ABOMINATION_LARGE); if (ends_with(name, "-headed hydra") && !starts_with(name, "spectral ")) - return get_hydra_spec(name); + return (get_hydra_spec(name)); if (ends_with(name, " slime creature")) - return get_slime_spec(name); + return (get_slime_spec(name)); mons_spec spec; get_zombie_type(name, spec); diff --git a/crawl-ref/source/mapdef.h b/crawl-ref/source/mapdef.h index eba71964b2..c08093243c 100644 --- a/crawl-ref/source/mapdef.h +++ b/crawl-ref/source/mapdef.h @@ -450,7 +450,7 @@ class mons_spec level_id place; monster_type monbase; // Base monster for zombies and dracs. mon_attitude_type attitude; - int number; // Head count for hydras + int number; // Head count for hydras, etc. int quantity; // Number of monsters (usually 1). int genweight, mlevel; bool fix_mons; diff --git a/crawl-ref/source/mon-util.cc b/crawl-ref/source/mon-util.cc index fc8edb9bec..8d37d99192 100644 --- a/crawl-ref/source/mon-util.cc +++ b/crawl-ref/source/mon-util.cc @@ -1804,8 +1804,10 @@ monster_type draconian_colour_by_name(const std::string &name) == (MONS_PALE_DRACONIAN - MONS_DRACONIAN), c1); for (unsigned i = 0; i < ARRAYSZ(drac_colour_names); ++i) + { if (name == drac_colour_names[i]) return (static_cast<monster_type>(i + MONS_BLACK_DRACONIAN)); + } return (MONS_PROGRAM_BUG); } |