diff options
| author | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2007-09-19 17:28:33 +0000 |
|---|---|---|
| committer | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2007-09-19 17:28:33 +0000 |
| commit | 1a9320fafb23940d0463e6f384713d0f99fc0c61 (patch) | |
| tree | d152680dbdc8febf0b5a445ba760255068d72f04 /src/monster.cpp | |
| parent | 2f027ebcf8f0ad78f7edf58af7dda94d89034c85 (diff) | |
| download | mana-1a9320fafb23940d0463e6f384713d0f99fc0c61.tar.gz mana-1a9320fafb23940d0463e6f384713d0f99fc0c61.tar.bz2 mana-1a9320fafb23940d0463e6f384713d0f99fc0c61.tar.xz mana-1a9320fafb23940d0463e6f384713d0f99fc0c61.zip | |
Merged 0.0 changes from revision 3362 to 3580 to trunk.
Diffstat (limited to 'src/monster.cpp')
| -rw-r--r-- | src/monster.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/monster.cpp b/src/monster.cpp index 768bf16a..2522a3e1 100644 --- a/src/monster.cpp +++ b/src/monster.cpp @@ -57,7 +57,7 @@ Monster::setAction(Action action) break; case DEAD: currentAction = ACTION_DEAD; - sound.playSfx(getInfo().getSound(EVENT_DIE)); + sound.playSfx(getInfo().getSound(MONSTER_EVENT_DIE)); break; case ATTACK: currentAction = ACTION_ATTACK; @@ -87,10 +87,10 @@ Monster::handleAttack() const MonsterInfo &mi = getInfo(); - // TODO: It's not possible to determine hit or miss here, so this stuff probably needs - // to be moved somewhere else. We may lose synchronization between attack animation and - // the sound, unless we adapt the protocol... - sound.playSfx(mi.getSound(EVENT_HIT)); + // TODO: It's not possible to determine hit or miss here, so this stuff + // probably needs to be moved somewhere else. We may lose synchronization + // between attack animation and the sound, unless we adapt the protocol... + sound.playSfx(mi.getSound(MONSTER_EVENT_HIT)); } Being::TargetCursorSize |