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.h | |
parent | 29a93440367af32463f285ae5f0bd2aa23aadc92 (diff) | |
download | plus-0d6ca48b79a596bec11fc7351fadbf3b1fc1f67b.tar.gz plus-0d6ca48b79a596bec11fc7351fadbf3b1fc1f67b.tar.bz2 plus-0d6ca48b79a596bec11fc7351fadbf3b1fc1f67b.tar.xz plus-0d6ca48b79a596bec11fc7351fadbf3b1fc1f67b.zip |
Move itemsoundevent into separate file.
Diffstat (limited to 'src/resources/iteminfo.h')
-rw-r--r-- | src/resources/iteminfo.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/resources/iteminfo.h b/src/resources/iteminfo.h index 8d25ff8f2..ce318ca61 100644 --- a/src/resources/iteminfo.h +++ b/src/resources/iteminfo.h @@ -164,11 +164,11 @@ class ItemInfo final void setAttackRange(const int r) { mAttackRange = r; } - void addSound(const ItemSoundEvent event, + void addSound(const ItemSoundEvent::Type event, const std::string &filename, const int delay); - const SoundInfo &getSound(const ItemSoundEvent event) + const SoundInfo &getSound(const ItemSoundEvent::Type event) const A_WARN_UNUSED; int getDrawBefore(const int direction) const A_WARN_UNUSED; @@ -294,7 +294,7 @@ class ItemInfo final std::map <int, std::string> mAnimationFiles; /** Stores the names of sounds to be played at certain event. */ - std::map <ItemSoundEvent, SoundInfoVect> mSounds; + std::map <ItemSoundEvent::Type, SoundInfoVect> mSounds; std::map <int, int> mTags; const std::map <int, ColorDB::ItemColor> *mColors; std::string mColorList; |