diff options
| author | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-01-03 21:21:26 +0000 |
|---|---|---|
| committer | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-01-03 21:21:26 +0000 |
| commit | d107e792196a1eba3e5dd2c3c50a0454ac68088d (patch) | |
| tree | 54974d350f7e4555fb0b2856be4c2d2a17b67a3e /crawl-ref/source/monstuff.cc | |
| parent | 90c66b94944ca1f5428c737d68261d86e927c7a2 (diff) | |
| download | crawl-ref-d107e792196a1eba3e5dd2c3c50a0454ac68088d.tar.gz crawl-ref-d107e792196a1eba3e5dd2c3c50a0454ac68088d.zip | |
Add miscellaneous type cleanups and comment fixes.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@3177 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/monstuff.cc')
| -rw-r--r-- | crawl-ref/source/monstuff.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/crawl-ref/source/monstuff.cc b/crawl-ref/source/monstuff.cc index 5d77b3838b..c4d0cce55e 100644 --- a/crawl-ref/source/monstuff.cc +++ b/crawl-ref/source/monstuff.cc @@ -1501,7 +1501,7 @@ bool swap_places(monsters *monster) bool swap = mon_dest_okay; - // chose an appropiate habitat square at random around the target. + // Choose an appropriate habitat square at random around the target. if (!swap) { int num_found = 0; @@ -5457,12 +5457,12 @@ static bool monster_move(monsters *monster) } return false; } - + // let's not even bother with this if mmov_x and mmov_y are zero. if (mmov_x == 0 && mmov_y == 0) return false; - if (mons_flies(monster) > 0 + if (mons_flies(monster) != FL_NONE || habitat != DNGN_FLOOR || mons_class_flag( monster->type, M_AMPHIBIOUS )) { @@ -5553,7 +5553,7 @@ static bool monster_move(monsters *monster) && deep_water_available && grd[monster->x][monster->y] != DNGN_DEEP_WATER && grd[monster->x + mmov_x][monster->y + mmov_y] != DNGN_DEEP_WATER - && (monster->x + mmov_x != you.x_pos + && (monster->x + mmov_x != you.x_pos || monster->y + mmov_y != you.y_pos) && (one_chance_in(3) || monster->hit_points <= (monster->max_hit_points * 3) / 4)) |