diff options
author | Andrei Karas <akaras@inbox.ru> | 2014-05-19 01:11:52 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2014-05-19 01:11:52 +0300 |
commit | 0d6ca48b79a596bec11fc7351fadbf3b1fc1f67b (patch) | |
tree | 4d03ab1e6b655bccafbad06e5cc3386a4f6480d7 /src/resources/iteminfo.cpp | |
parent | 29a93440367af32463f285ae5f0bd2aa23aadc92 (diff) | |
download | mv-0d6ca48b79a596bec11fc7351fadbf3b1fc1f67b.tar.gz mv-0d6ca48b79a596bec11fc7351fadbf3b1fc1f67b.tar.bz2 mv-0d6ca48b79a596bec11fc7351fadbf3b1fc1f67b.tar.xz mv-0d6ca48b79a596bec11fc7351fadbf3b1fc1f67b.zip |
Move itemsoundevent into separate file.
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 c4af7d30a..acf355b87 100644 --- a/src/resources/iteminfo.cpp +++ b/src/resources/iteminfo.cpp @@ -131,17 +131,17 @@ void ItemInfo::setWaterAttackAction(const std::string &attackAction) mWaterAttackAction = attackAction; } -void ItemInfo::addSound(const ItemSoundEvent event, +void ItemInfo::addSound(const ItemSoundEvent::Type event, const std::string &filename, const int delay) { mSounds[event].push_back(SoundInfo( paths.getStringValue("sfx").append(filename), delay)); } -const SoundInfo &ItemInfo::getSound(const ItemSoundEvent event) const +const SoundInfo &ItemInfo::getSound(const ItemSoundEvent::Type event) const { static const SoundInfo empty("", 0); - std::map<ItemSoundEvent, SoundInfoVect>::const_iterator i; + std::map<ItemSoundEvent::Type, SoundInfoVect>::const_iterator i; i = mSounds.find(event); |