summaryrefslogtreecommitdiff
path: root/src/resources/soundinfo.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/resources/soundinfo.h')
-rw-r--r--src/resources/soundinfo.h24
1 files changed, 3 insertions, 21 deletions
diff --git a/src/resources/soundinfo.h b/src/resources/soundinfo.h
index bae53ae35..2e0bf46cc 100644
--- a/src/resources/soundinfo.h
+++ b/src/resources/soundinfo.h
@@ -21,6 +21,8 @@
#ifndef RESOURCES_SOUNDINFO_H
#define RESOURCES_SOUNDINFO_H
+#include "resources/itemsoundevent.h"
+
#include <map>
#include <string>
#include <vector>
@@ -40,26 +42,6 @@ struct SoundInfo final
};
typedef std::vector<SoundInfo> SoundInfoVect;
-
-enum ItemSoundEvent
-{
- SOUND_EVENT_HIT = 0,
- SOUND_EVENT_MISS,
- SOUND_EVENT_HURT,
- SOUND_EVENT_DIE,
- SOUND_EVENT_MOVE,
- SOUND_EVENT_SIT,
- SOUND_EVENT_SITTOP,
- SOUND_EVENT_SPAWN,
- SOUND_EVENT_DROP,
- SOUND_EVENT_PICKUP,
- SOUND_EVENT_TAKE, // take from container
- SOUND_EVENT_PUT, // put into container
- SOUND_EVENT_EQUIP,
- SOUND_EVENT_UNEQUIP,
- SOUND_EVENT_USE
-};
-
-typedef std::map<ItemSoundEvent, SoundInfoVect*> ItemSoundEvents;
+typedef std::map<ItemSoundEvent::Type, SoundInfoVect*> ItemSoundEvents;
#endif // RESOURCES_SOUNDINFO_H