diff options
| author | abrahamwl <abrahamwl@gmail.com> | 2009-10-31 06:16:23 -0700 |
|---|---|---|
| committer | Steven Noonan <steven@uplinklabs.net> | 2009-10-31 06:29:17 -0700 |
| commit | 76596a5ea224f9ed96f1282b526a86a32032c547 (patch) | |
| tree | edc249c3ea9235b78e1cf405c62579a1e58302a4 /crawl-ref/source/player.cc | |
| parent | e232445b8157b09e53b3897acbf9e47183d98a96 (diff) | |
| download | crawl-ref-76596a5ea224f9ed96f1282b526a86a32032c547.tar.gz crawl-ref-76596a5ea224f9ed96f1282b526a86a32032c547.zip | |
Combine mons_is_submerged(monsters *m) into monsters::submerged()
...and replace all references to mons_is_submerged() with submerged().
It's a dirty job, but someone's got to do it. (Thank God for regex!)
Diffstat (limited to 'crawl-ref/source/player.cc')
| -rw-r--r-- | crawl-ref/source/player.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/crawl-ref/source/player.cc b/crawl-ref/source/player.cc index 272eceb391..d5c6ccf3c6 100644 --- a/crawl-ref/source/player.cc +++ b/crawl-ref/source/player.cc @@ -119,7 +119,7 @@ bool move_player_to_grid( const coord_def& p, bool stepped, bool allow_shift, // Better not be an unsubmerged monster either. ASSERT(swapping && mgrd(p) != NON_MONSTER || !swapping && (mgrd(p) == NON_MONSTER - || mons_is_submerged( &menv[ mgrd(p) ]) + || menv[ mgrd(p) ].submerged() || feawn_passthrough(&menv[mgrd(p)]))); // Don't prompt if force is true. @@ -1053,7 +1053,7 @@ int player_damage_type(void) // the player has a polearm). bool player_can_hit_monster(const monsters *mon) { - if (!mons_is_submerged(mon)) + if (!mon->submerged()) return (true); if (grd(mon->pos()) != DNGN_SHALLOW_WATER) @@ -2729,7 +2729,7 @@ void check_beholders() { const monsters* mon = &menv[you.mesmerised_by[i]]; if (!mon->alive() || mons_genus(mon->type) != MONS_MERMAID - || mons_is_submerged(mon)) + || mon->submerged()) { #ifdef DEBUG if (!mon->alive()) |