diff options
| author | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-03-02 18:49:18 +0000 |
|---|---|---|
| committer | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-03-02 18:49:18 +0000 |
| commit | 3ef70e6dea67553bc7f0748e57434b8fa8dc82cf (patch) | |
| tree | cb1012bc18bf933615b2433dd85dfcb24c3ba668 /crawl-ref/source/player.cc | |
| parent | 02f124467ef2c4f86de56628fa0ce76f77bc126c (diff) | |
| download | crawl-ref-3ef70e6dea67553bc7f0748e57434b8fa8dc82cf.tar.gz crawl-ref-3ef70e6dea67553bc7f0748e57434b8fa8dc82cf.zip | |
Use monsters::mindex() in a few more places.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@9314 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/player.cc')
| -rw-r--r-- | crawl-ref/source/player.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crawl-ref/source/player.cc b/crawl-ref/source/player.cc index 436039914d..c8af10a78b 100644 --- a/crawl-ref/source/player.cc +++ b/crawl-ref/source/player.cc @@ -2636,7 +2636,7 @@ bool player_mesmerised_by(const monsters *mon) #ifdef DEBUG_DIAGNOSTICS mprf(MSGCH_DIAGNOSTICS, "mesmerised_by.size: %d, DUR_MESMERISED: %d, " "current mon: %d", you.mesmerised_by.size(), - you.duration[DUR_MESMERISED], monster_index(mon)); + you.duration[DUR_MESMERISED], mon->mindex()); #endif if (you.mesmerised_by.empty()) // shouldn't happen @@ -6919,7 +6919,7 @@ int player::hurt(const actor *agent, int amount, beam_type flavour, const monsters *mon = dynamic_cast<const monsters*>(agent); if (agent->atype() == ACT_MONSTER) { - ouch(amount, monster_index(mon), + ouch(amount, mon->mindex(), KILLED_BY_MONSTER, "", player_monster_visible(mon)); } else |