diff options
| author | dshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-04-07 23:29:36 +0000 |
|---|---|---|
| committer | dshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-04-07 23:29:36 +0000 |
| commit | e6c1b4bbeba12074f61dbac3d026f391ec841110 (patch) | |
| tree | 55d8439949967af2c34f761be8a245e1eb144637 /crawl-ref/source/mon-util.cc | |
| parent | 19a176d9f092f4f271652b348cafa0e7ebc578d2 (diff) | |
| download | crawl-ref-e6c1b4bbeba12074f61dbac3d026f391ec841110.tar.gz crawl-ref-e6c1b4bbeba12074f61dbac3d026f391ec841110.zip | |
Merged 1257:1259, 1260:1262 from trunk to 0.2 branch:
- PR misapplication in monster combat.
- Hydra decapitation experience bug.
- Detect Creatures and Items fix.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup-0.2@1263 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/mon-util.cc')
| -rw-r--r-- | crawl-ref/source/mon-util.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crawl-ref/source/mon-util.cc b/crawl-ref/source/mon-util.cc index e8cc6205fd..f25858a518 100644 --- a/crawl-ref/source/mon-util.cc +++ b/crawl-ref/source/mon-util.cc @@ -2786,7 +2786,7 @@ god_type monsters::deity() const return (god); } -void monsters::hurt(actor *agent, int amount) +void monsters::hurt(const actor *agent, int amount) { if (amount <= 0) return; @@ -2798,7 +2798,7 @@ void monsters::hurt(actor *agent, int amount) monster_die(this, KILL_YOU, 0); else monster_die(this, KILL_MON, - monster_index( dynamic_cast<monsters*>(agent) )); + monster_index( dynamic_cast<const monsters*>(agent) )); } } |