diff options
author | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-01-04 17:36:28 +0000 |
---|---|---|
committer | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-01-04 17:36:28 +0000 |
commit | ca64bade7f7c4290031cfad630174d4e888b8ac6 (patch) | |
tree | ae69ff6d762608f83da002e1b18fa7773d391074 | |
parent | 7c7d0e9149d4379e91ce82555d1121447963634f (diff) | |
download | crawl-ref-ca64bade7f7c4290031cfad630174d4e888b8ac6.tar.gz crawl-ref-ca64bade7f7c4290031cfad630174d4e888b8ac6.zip |
Add more miscellaneous cosmetic cleanups.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@3188 c06c8d41-db1a-0410-9941-cceddc491573
-rw-r--r-- | crawl-ref/source/mon-util.cc | 108 | ||||
-rw-r--r-- | crawl-ref/source/mon-util.h | 16 |
2 files changed, 62 insertions, 62 deletions
diff --git a/crawl-ref/source/mon-util.cc b/crawl-ref/source/mon-util.cc index c973038689..f06a1b7856 100644 --- a/crawl-ref/source/mon-util.cc +++ b/crawl-ref/source/mon-util.cc @@ -365,19 +365,19 @@ mon_holy_type mons_class_holiness(int mc) return (smc->holiness); } // end mons_holiness() -bool mons_class_is_stationary(int type) +bool mons_class_is_stationary(int mc) { - return (type == MONS_OKLOB_PLANT - || type == MONS_PLANT - || type == MONS_FUNGUS - || type == MONS_CURSE_SKULL - || mons_is_statue(type) - || mons_is_mimic(type)); + return (mc == MONS_OKLOB_PLANT + || mc == MONS_PLANT + || mc == MONS_FUNGUS + || mc == MONS_CURSE_SKULL + || mons_is_statue(mc) + || mons_is_mimic(mc)); } -bool mons_is_stationary(const monsters *mons) +bool mons_is_stationary(const monsters *mon) { - return (mons_class_is_stationary(mons->type)); + return (mons_class_is_stationary(mon->type)); } bool mons_class_is_confusable(int mc) @@ -393,47 +393,47 @@ bool mons_class_is_slowable(int mc) // returns whether a monster is non-solid // and thus can't be affected by some traps -bool mons_is_insubstantial(int type) -{ - switch(type) - { - // vortices - case MONS_FIRE_VORTEX: - case MONS_SPATIAL_VORTEX: - // elementals - case MONS_FIRE_ELEMENTAL: - case MONS_AIR_ELEMENTAL: - case MONS_WATER_ELEMENTAL: - // vapours - case MONS_INSUBSTANTIAL_WISP: - case MONS_VAPOUR: - // ghosts and some undead - case MONS_PLAYER_GHOST: - case MONS_HUNGRY_GHOST: - case MONS_SHADOW: - case MONS_SMOKE_DEMON: - case MONS_SHADOW_WRAITH: - // others - case MONS_BALL_LIGHTNING: - case MONS_GIANT_SPORE: - case MONS_ORB_OF_FIRE: - return true; - default: - return false; - } -} - -bool mons_behaviour_perceptible(const monsters *mons) -{ - return (!mons_class_flag(mons->type, M_NO_EXP_GAIN) - && !mons_is_mimic(mons->type) - && !mons_is_statue(mons->type) - && mons->type != MONS_OKLOB_PLANT); -} - -bool mons_is_icy(const monsters *mons) -{ - return (mons_is_icy(mons->type)); +bool mons_is_insubstantial(int mc) +{ + switch (mc) + { + // vortices + case MONS_FIRE_VORTEX: + case MONS_SPATIAL_VORTEX: + // elementals + case MONS_FIRE_ELEMENTAL: + case MONS_AIR_ELEMENTAL: + case MONS_WATER_ELEMENTAL: + // vapours + case MONS_INSUBSTANTIAL_WISP: + case MONS_VAPOUR: + // ghosts and some undead + case MONS_PLAYER_GHOST: + case MONS_HUNGRY_GHOST: + case MONS_SHADOW: + case MONS_SMOKE_DEMON: + case MONS_SHADOW_WRAITH: + // others + case MONS_BALL_LIGHTNING: + case MONS_GIANT_SPORE: + case MONS_ORB_OF_FIRE: + return true; + default: + return false; + } +} + +bool mons_behaviour_perceptible(const monsters *mon) +{ + return (!mons_class_flag(mon->type, M_NO_EXP_GAIN) + && !mons_is_mimic(mon->type) + && !mons_is_statue(mon->type) + && mon->type != MONS_OKLOB_PLANT); +} + +bool mons_is_icy(const monsters *mon) +{ + return (mons_is_icy(mon->type)); } bool mons_is_icy(int mtype) @@ -444,15 +444,15 @@ bool mons_is_icy(int mtype) || mtype == MONS_ICE_STATUE); } -bool invalid_monster(const monsters *mons) +bool invalid_monster(const monsters *mon) { - return (!mons || mons->type == -1); + return (!mon || mon->type == -1); } bool invalid_monster_class(int mclass) { - return (mclass < 0 - || mclass >= NUM_MONSTERS + return (mclass < 0 + || mclass >= NUM_MONSTERS || mon_entry[mclass] == -1 || mon_entry[mclass] == MONS_PROGRAM_BUG); } diff --git a/crawl-ref/source/mon-util.h b/crawl-ref/source/mon-util.h index 5b0953eea1..5f79e9bf3e 100644 --- a/crawl-ref/source/mon-util.h +++ b/crawl-ref/source/mon-util.h @@ -596,7 +596,7 @@ bool mons_friendly(const monsters *m); bool mons_neutral(const monsters *m); mon_attitude_type mons_attitude(const monsters *m); -bool mons_behaviour_perceptible(const monsters *mons); +bool mons_behaviour_perceptible(const monsters *mon); bool mons_is_confused(const monsters *m); bool mons_is_caught(const monsters *m); bool mons_is_fleeing(const monsters *m); @@ -606,7 +606,7 @@ bool mons_was_seen(const monsters *m); bool mons_is_known_mimic(const monsters *m); bool mons_is_evil( const monsters *mon ); bool mons_is_unholy( const monsters *mon ); -bool mons_is_icy(const monsters *mons); +bool mons_is_icy(const monsters *mon); bool mons_is_icy(int mtype); bool mons_has_lifeforce( const monsters *mon ); monster_type mons_genus( int mc ); @@ -618,14 +618,14 @@ bool mons_looks_distracted(const monsters *m); bool check_mons_resist_magic( const monsters *monster, int pow ); -bool mons_class_is_stationary(int monsclass); -bool mons_class_is_confusable(int monsclass); -bool mons_class_is_slowable(int monsclass); -bool mons_is_stationary(const monsters *mons); -bool mons_is_insubstantial(int type); +bool mons_class_is_stationary(int mc); +bool mons_class_is_confusable(int mc); +bool mons_class_is_slowable(int mc); +bool mons_is_stationary(const monsters *mon); +bool mons_is_insubstantial(int mc); bool mons_is_submerged( const monsters *mon ); -bool invalid_monster(const monsters *mons); +bool invalid_monster(const monsters *mon); bool invalid_monster_class(int mclass); bool monster_shover(const monsters *m); |