diff options
| author | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-10-07 03:29:56 +0000 |
|---|---|---|
| committer | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-10-07 03:29:56 +0000 |
| commit | cdac4bea67260de3c486e86429ab81086a383169 (patch) | |
| tree | 4b4ee7179c8a5914bb45f74d645776ad8b5ae75a /crawl-ref/source | |
| parent | b6484c07a27d0856140792f33397930f9e6e7689 (diff) | |
| download | crawl-ref-cdac4bea67260de3c486e86429ab81086a383169.tar.gz crawl-ref-cdac4bea67260de3c486e86429ab81086a383169.zip | |
Add yet more minor cosmetic fixes.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@7170 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source')
| -rw-r--r-- | crawl-ref/source/mon-util.cc | 14 | ||||
| -rw-r--r-- | crawl-ref/source/mon-util.h | 2 |
2 files changed, 8 insertions, 8 deletions
diff --git a/crawl-ref/source/mon-util.cc b/crawl-ref/source/mon-util.cc index 07f3f24b38..eb85db1b76 100644 --- a/crawl-ref/source/mon-util.cc +++ b/crawl-ref/source/mon-util.cc @@ -855,24 +855,24 @@ mon_attack_def downscale_zombie_attack(const monsters *mons, return (attk); } -mon_attack_def mons_attack_spec(const monsters *mons, int attk_number) +mon_attack_def mons_attack_spec(const monsters *mon, int attk_number) { - int mc = mons->type; - const bool zombified = mons_is_zombified(mons); + int mc = mon->type; + const bool zombified = mons_is_zombified(mon); - if (attk_number < 0 || attk_number > 3 || mons->has_hydra_multi_attack()) + if (attk_number < 0 || attk_number > 3 || mon->has_hydra_multi_attack()) attk_number = 0; if (mc == MONS_PLAYER_GHOST || mc == MONS_PANDEMONIUM_DEMON) { if (attk_number == 0) - return mon_attack_def::attk(mons->ghost->damage); + return mon_attack_def::attk(mon->ghost->damage); else return mon_attack_def::attk(0, AT_NONE); } if (zombified) - mc = mons_zombie_base(mons); + mc = mons_zombie_base(mon); ASSERT(smc); mon_attack_def attk = smc->attack[attk_number]; @@ -889,7 +889,7 @@ mon_attack_def mons_attack_spec(const monsters *mons, int attk_number) } } - return (zombified ? downscale_zombie_attack(mons, attk) : attk); + return (zombified ? downscale_zombie_attack(mon, attk) : attk); } int mons_damage(int mc, int rt) diff --git a/crawl-ref/source/mon-util.h b/crawl-ref/source/mon-util.h index a5cf8dc3d9..ccdd5f50ff 100644 --- a/crawl-ref/source/mon-util.h +++ b/crawl-ref/source/mon-util.h @@ -509,7 +509,7 @@ const char* mons_resist_string(const monsters *mon); * called from: fight - monstuff * *********************************************************************** */ int mons_damage(int mc, int rt); -mon_attack_def mons_attack_spec(const monsters *, int rt); +mon_attack_def mons_attack_spec(const monsters *mon, int attk_number); // last updated 12may2000 {dlb} /* *********************************************************************** |