diff options
author | Andrei Karas <akaras@inbox.ru> | 2013-10-04 02:03:12 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2013-10-04 13:13:21 +0300 |
commit | 343809fe458a08bf96fe4f537db2d81d7523632e (patch) | |
tree | 0230a135f3ecaf574a3d67f090e6dcb21f1934f5 /src/resources/iteminfo.cpp | |
parent | b0238edbc3f125e5d7d9d1506f7c9b78a440a200 (diff) | |
download | mv-343809fe458a08bf96fe4f537db2d81d7523632e.tar.gz mv-343809fe458a08bf96fe4f537db2d81d7523632e.tar.bz2 mv-343809fe458a08bf96fe4f537db2d81d7523632e.tar.xz mv-343809fe458a08bf96fe4f537db2d81d7523632e.zip |
Add new item sound events constants.
Diffstat (limited to 'src/resources/iteminfo.cpp')
-rw-r--r-- | src/resources/iteminfo.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/resources/iteminfo.cpp b/src/resources/iteminfo.cpp index fa8ca2b61..cc7cc41c7 100644 --- a/src/resources/iteminfo.cpp +++ b/src/resources/iteminfo.cpp @@ -129,17 +129,17 @@ void ItemInfo::setWaterAttackAction(const std::string &attackAction) mWaterAttackAction = attackAction; } -void ItemInfo::addSound(const SoundEvent event, +void ItemInfo::addSound(const ItemSoundEvent event, const std::string &filename, const int delay) { mSounds[event].push_back(SoundInfo( paths.getStringValue("sfx").append(filename), delay)); } -const SoundInfo &ItemInfo::getSound(const SoundEvent event) const +const SoundInfo &ItemInfo::getSound(const ItemSoundEvent event) const { static const SoundInfo empty("", 0); - std::map<SoundEvent, SoundInfoVect>::const_iterator i; + std::map<ItemSoundEvent, SoundInfoVect>::const_iterator i; i = mSounds.find(event); |