diff options
| author | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-03-14 00:27:21 +0000 |
|---|---|---|
| committer | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-03-14 00:27:21 +0000 |
| commit | d7711166c771976bf2f668e04229539c1028ba06 (patch) | |
| tree | 5dc8c56784a1c7eabc5def9452aaae1b93160ddf | |
| parent | 289b890fb1cc7b1c01b32c11c49952980592de43 (diff) | |
| download | crawl-ref-d7711166c771976bf2f668e04229539c1028ba06.tar.gz crawl-ref-d7711166c771976bf2f668e04229539c1028ba06.zip | |
Add still more minor cosmetic fixes.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@9456 c06c8d41-db1a-0410-9941-cceddc491573
| -rw-r--r-- | crawl-ref/source/mon-util.cc | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/crawl-ref/source/mon-util.cc b/crawl-ref/source/mon-util.cc index fdaa5d94a2..113d8a6973 100644 --- a/crawl-ref/source/mon-util.cc +++ b/crawl-ref/source/mon-util.cc @@ -950,14 +950,13 @@ bool mons_class_is_zombified(int mc) bool mons_is_zombified(const monsters *mon) { - return mons_class_is_zombified(mon->type); + return (mons_class_is_zombified(mon->type)); } bool mons_class_can_be_zombified(int mc) { int ms = mons_species(mc); - return (mons_zombie_size(ms) != Z_NOZOMBIE - && mons_weight(ms) > 0); + return (mons_zombie_size(ms) != Z_NOZOMBIE && mons_weight(ms) > 0); } bool mons_can_be_zombified(const monsters *mon) @@ -998,8 +997,7 @@ bool mons_enslaved_intact_soul(const monsters *mon) bool mons_enslaved_soul(const monsters *mon) { - return (mons_enslaved_twisted_soul(mon) - || mons_enslaved_intact_soul(mon)); + return (mons_enslaved_twisted_soul(mon) || mons_enslaved_intact_soul(mon)); } bool name_zombie(monsters *mon, int mc, const std::string mon_name) @@ -2339,8 +2337,8 @@ habitat_type mons_class_habitat(int mc) habitat_type mons_habitat(const monsters *mon) { - return mons_class_habitat(mons_is_zombified(mon) ? mons_zombie_base(mon) - : mon->type); + return (mons_class_habitat(mons_is_zombified(mon) ? mons_zombie_base(mon) + : mon->type)); } habitat_type mons_class_primary_habitat(int mc) @@ -2355,8 +2353,8 @@ habitat_type mons_class_primary_habitat(int mc) habitat_type mons_primary_habitat(const monsters *mon) { - return mons_class_primary_habitat(mons_is_zombified(mon) ? mons_zombie_base(mon) - : mon->type); + return (mons_class_primary_habitat(mons_is_zombified(mon) ? mons_zombie_base(mon) + : mon->type)); } habitat_type mons_class_secondary_habitat(int mc) @@ -2371,8 +2369,8 @@ habitat_type mons_class_secondary_habitat(int mc) habitat_type mons_secondary_habitat(const monsters *mon) { - return mons_class_secondary_habitat(mons_is_zombified(mon) ? mons_zombie_base(mon) - : mon->type); + return (mons_class_secondary_habitat(mons_is_zombified(mon) ? mons_zombie_base(mon) + : mon->type)); } bool intelligent_ally(const monsters *mon) |