diff options
Diffstat (limited to 'src/resources')
| -rw-r--r-- | src/resources/beinginfo.h | 7 | ||||
| -rw-r--r-- | src/resources/itemdb.cpp | 2 | ||||
| -rw-r--r-- | src/resources/monsterdb.cpp | 12 | ||||
| -rw-r--r-- | src/resources/spritedef.h | 1 |
4 files changed, 19 insertions, 3 deletions
diff --git a/src/resources/beinginfo.h b/src/resources/beinginfo.h index 2eac4237..20e66067 100644 --- a/src/resources/beinginfo.h +++ b/src/resources/beinginfo.h @@ -43,10 +43,13 @@ struct Attack enum class SoundEvent { + DIE, HIT, - MISS, HURT, - DIE + MISS, + MOVE, + SIT, + SPAWN, }; /** diff --git a/src/resources/itemdb.cpp b/src/resources/itemdb.cpp index bb5b5abd..0957fd0a 100644 --- a/src/resources/itemdb.cpp +++ b/src/resources/itemdb.cpp @@ -139,7 +139,7 @@ void ItemDB::loadSoundRef(ItemInfo &itemInfo, xmlNodePtr node) { itemInfo.addSound(EQUIP_EVENT_HIT, filename); } - else if (event == "strike") + else if (event == "strike" || event == "miss") // #68 { itemInfo.addSound(EQUIP_EVENT_STRIKE, filename); } diff --git a/src/resources/monsterdb.cpp b/src/resources/monsterdb.cpp index 38806f13..20d938be 100644 --- a/src/resources/monsterdb.cpp +++ b/src/resources/monsterdb.cpp @@ -112,6 +112,18 @@ void MonsterDB::readMonsterNode(xmlNodePtr node, const std::string &filename) { currentInfo->addSound(SoundEvent::DIE, soundFile); } + else if (event == "move") + { + currentInfo->addSound(SoundEvent::MOVE, filename); + } + else if (event == "sit") + { + currentInfo->addSound(SoundEvent::SIT, filename); + } + else if (event == "spawn") + { + currentInfo->addSound(SoundEvent::SPAWN, filename); + } else { logger->log("MonsterDB: Warning, sound effect %s for " diff --git a/src/resources/spritedef.h b/src/resources/spritedef.h index ec5e8927..3bb0b7a0 100644 --- a/src/resources/spritedef.h +++ b/src/resources/spritedef.h @@ -64,6 +64,7 @@ namespace SpriteAction static const std::string DEAD = "dead"; static const std::string MOVE = "walk"; static const std::string ATTACK = "attack"; + static const std::string SPAWN = "spawn"; static const std::string HURT = "hurt"; static const std::string USE_SPECIAL = "special"; static const std::string CAST_MAGIC = "magic"; |