Remove duplicate code from monsterdb, homunculusdb, mercenarydb.

3 files changed, 6 insertions, 324 deletions

diff --git a/src/resources/db/homunculusdb.cpp b/src/resources/db/homunculusdb.cpp
index 76d8189db..317d0c2df 100644
--- a/src/resources/db/homunculusdb.cpp
+++ b/src/resources/db/homunculusdb.cpp
@@ -128,114 +128,8 @@ void HomunculusDB::loadXmlFile(const std::string &fileName)
         // iterate <sprite>s and <sound>s
         for_each_xml_child_node(spriteNode, homunculusNode)
         {
-            if (xmlNameEqual(spriteNode, "sprite"))
-            {
-                if (!spriteNode->xmlChildrenNode)
-                    continue;
-
-                SpriteReference *const currentSprite = new SpriteReference;
-                currentSprite->sprite = reinterpret_cast<const char*>(
-                    spriteNode->xmlChildrenNode->content);
-
-                currentSprite->variant = XML::getProperty(
-                    spriteNode, "variant", 0);
-                display.sprites.push_back(currentSprite);
-            }
-            else if (xmlNameEqual(spriteNode, "sound"))
-            {
-                if (!spriteNode->xmlChildrenNode)
-                    continue;
-
-                const std::string event = XML::getProperty(
-                    spriteNode, "event", "");
-                const int delay = XML::getProperty(
-                    spriteNode, "delay", 0);
-                const char *const filename = reinterpret_cast<const char*>(
-                    spriteNode->xmlChildrenNode->content);
-
-                if (event == "hit")
-                {
-                    currentInfo->addSound(ItemSoundEvent::HIT,
-                        filename, delay);
-                }
-                else if (event == "miss")
-                {
-                    currentInfo->addSound(ItemSoundEvent::MISS,
-                        filename, delay);
-                }
-                else if (event == "hurt")
-                {
-                    currentInfo->addSound(ItemSoundEvent::HURT,
-                        filename, delay);
-                }
-                else if (event == "die")
-                {
-                    currentInfo->addSound(ItemSoundEvent::DIE,
-                        filename, delay);
-                }
-                else if (event == "move")
-                {
-                    currentInfo->addSound(ItemSoundEvent::MOVE,
-                        filename, delay);
-                }
-                else if (event == "sit")
-                {
-                    currentInfo->addSound(ItemSoundEvent::SIT,
-                        filename, delay);
-                }
-                else if (event == "sittop")
-                {
-                    currentInfo->addSound(ItemSoundEvent::SITTOP,
-                        filename, delay);
-                }
-                else if (event == "spawn")
-                {
-                    currentInfo->addSound(ItemSoundEvent::SPAWN,
-                        filename, delay);
-                }
-                else
-                {
-                    logger->log("HomunculusDB: Warning, sound effect %s for "
-                                "unknown event %s of homunculus %s",
-                                filename, event.c_str(),
-                                currentInfo->getName().c_str());
-                }
-            }
-            else if (xmlNameEqual(spriteNode, "attack"))
-            {
-                const int attackId = XML::getProperty(spriteNode, "id", 0);
-                const int effectId = XML::getProperty(
-                    spriteNode, "effect-id", paths.getIntValue("effectId"));
-                const int hitEffectId = XML::getProperty(spriteNode,
-                    "hit-effect-id", paths.getIntValue("hitEffectId"));
-                const int criticalHitEffectId = XML::getProperty(spriteNode,
-                    "critical-hit-effect-id",
-                    paths.getIntValue("criticalHitEffectId"));
-                const int missEffectId = XML::getProperty(spriteNode,
-                    "miss-effect-id", paths.getIntValue("missEffectId"));
-
-                const std::string spriteAction = XML::getProperty(
-                    spriteNode, "action", "attack");
-                const std::string skySpriteAction = XML::getProperty(
-                    spriteNode, "skyaction", "skyattack");
-                const std::string waterSpriteAction = XML::getProperty(
-                    spriteNode, "wateraction", "waterattack");
-
-                const std::string missileParticle = XML::getProperty(
-                        spriteNode, "missile-particle", "");
-
-                currentInfo->addAttack(attackId, spriteAction, skySpriteAction,
-                    waterSpriteAction, effectId, hitEffectId,
-                    criticalHitEffectId, missEffectId, missileParticle);
-            }
-            else if (xmlNameEqual(spriteNode, "particlefx"))
-            {
-                if (!spriteNode->xmlChildrenNode)
-                    continue;
-
-                display.particles.push_back(reinterpret_cast<const char*>(
-                    spriteNode->xmlChildrenNode->content));
-            }
+            BeingCommon::readObjectNodes(spriteNode, display,
+                currentInfo, "HomunculusDB");
         }
         currentInfo->setDisplay(display);
 
diff --git a/src/resources/db/mercenarydb.cpp b/src/resources/db/mercenarydb.cpp
index ed8be1ffe..432b64006 100644
--- a/src/resources/db/mercenarydb.cpp
+++ b/src/resources/db/mercenarydb.cpp
@@ -128,114 +128,8 @@ void MercenaryDB::loadXmlFile(const std::string &fileName)
         // iterate <sprite>s and <sound>s
         for_each_xml_child_node(spriteNode, mercenaryNode)
         {
-            if (xmlNameEqual(spriteNode, "sprite"))
-            {
-                if (!spriteNode->xmlChildrenNode)
-                    continue;
-
-                SpriteReference *const currentSprite = new SpriteReference;
-                currentSprite->sprite = reinterpret_cast<const char*>(
-                    spriteNode->xmlChildrenNode->content);
-
-                currentSprite->variant = XML::getProperty(
-                    spriteNode, "variant", 0);
-                display.sprites.push_back(currentSprite);
-            }
-            else if (xmlNameEqual(spriteNode, "sound"))
-            {
-                if (!spriteNode->xmlChildrenNode)
-                    continue;
-
-                const std::string event = XML::getProperty(
-                    spriteNode, "event", "");
-                const int delay = XML::getProperty(
-                    spriteNode, "delay", 0);
-                const char *const filename = reinterpret_cast<const char*>(
-                    spriteNode->xmlChildrenNode->content);
-
-                if (event == "hit")
-                {
-                    currentInfo->addSound(ItemSoundEvent::HIT,
-                        filename, delay);
-                }
-                else if (event == "miss")
-                {
-                    currentInfo->addSound(ItemSoundEvent::MISS,
-                        filename, delay);
-                }
-                else if (event == "hurt")
-                {
-                    currentInfo->addSound(ItemSoundEvent::HURT,
-                        filename, delay);
-                }
-                else if (event == "die")
-                {
-                    currentInfo->addSound(ItemSoundEvent::DIE,
-                        filename, delay);
-                }
-                else if (event == "move")
-                {
-                    currentInfo->addSound(ItemSoundEvent::MOVE,
-                        filename, delay);
-                }
-                else if (event == "sit")
-                {
-                    currentInfo->addSound(ItemSoundEvent::SIT,
-                        filename, delay);
-                }
-                else if (event == "sittop")
-                {
-                    currentInfo->addSound(ItemSoundEvent::SITTOP,
-                        filename, delay);
-                }
-                else if (event == "spawn")
-                {
-                    currentInfo->addSound(ItemSoundEvent::SPAWN,
-                        filename, delay);
-                }
-                else
-                {
-                    logger->log("MercenaryDB: Warning, sound effect %s for "
-                                "unknown event %s of mercenary %s",
-                                filename, event.c_str(),
-                                currentInfo->getName().c_str());
-                }
-            }
-            else if (xmlNameEqual(spriteNode, "attack"))
-            {
-                const int attackId = XML::getProperty(spriteNode, "id", 0);
-                const int effectId = XML::getProperty(
-                    spriteNode, "effect-id", paths.getIntValue("effectId"));
-                const int hitEffectId = XML::getProperty(spriteNode,
-                    "hit-effect-id", paths.getIntValue("hitEffectId"));
-                const int criticalHitEffectId = XML::getProperty(spriteNode,
-                    "critical-hit-effect-id",
-                    paths.getIntValue("criticalHitEffectId"));
-                const int missEffectId = XML::getProperty(spriteNode,
-                    "miss-effect-id", paths.getIntValue("missEffectId"));
-
-                const std::string spriteAction = XML::getProperty(
-                    spriteNode, "action", "attack");
-                const std::string skySpriteAction = XML::getProperty(
-                    spriteNode, "skyaction", "skyattack");
-                const std::string waterSpriteAction = XML::getProperty(
-                    spriteNode, "wateraction", "waterattack");
-
-                const std::string missileParticle = XML::getProperty(
-                        spriteNode, "missile-particle", "");
-
-                currentInfo->addAttack(attackId, spriteAction, skySpriteAction,
-                    waterSpriteAction, effectId, hitEffectId,
-                    criticalHitEffectId, missEffectId, missileParticle);
-            }
-            else if (xmlNameEqual(spriteNode, "particlefx"))
-            {
-                if (!spriteNode->xmlChildrenNode)
-                    continue;
-
-                display.particles.push_back(reinterpret_cast<const char*>(
-                    spriteNode->xmlChildrenNode->content));
-            }
+            BeingCommon::readObjectNodes(spriteNode, display,
+                currentInfo, "MonsterDB");
         }
         currentInfo->setDisplay(display);
 
diff --git a/src/resources/db/monsterdb.cpp b/src/resources/db/monsterdb.cpp
index 7897d6198..1cbfe66c5 100644
--- a/src/resources/db/monsterdb.cpp
+++ b/src/resources/db/monsterdb.cpp
@@ -135,114 +135,8 @@ void MonsterDB::loadXmlFile(const std::string &fileName)
         // iterate <sprite>s and <sound>s
         for_each_xml_child_node(spriteNode, monsterNode)
         {
-            if (xmlNameEqual(spriteNode, "sprite"))
-            {
-                if (!spriteNode->xmlChildrenNode)
-                    continue;
-
-                SpriteReference *const currentSprite = new SpriteReference;
-                currentSprite->sprite = reinterpret_cast<const char*>(
-                    spriteNode->xmlChildrenNode->content);
-
-                currentSprite->variant = XML::getProperty(
-                    spriteNode, "variant", 0);
-                display.sprites.push_back(currentSprite);
-            }
-            else if (xmlNameEqual(spriteNode, "sound"))
-            {
-                if (!spriteNode->xmlChildrenNode)
-                    continue;
-
-                const std::string event = XML::getProperty(
-                    spriteNode, "event", "");
-                const int delay = XML::getProperty(
-                    spriteNode, "delay", 0);
-                const char *const filename = reinterpret_cast<const char*>(
-                    spriteNode->xmlChildrenNode->content);
-
-                if (event == "hit")
-                {
-                    currentInfo->addSound(ItemSoundEvent::HIT,
-                        filename, delay);
-                }
-                else if (event == "miss")
-                {
-                    currentInfo->addSound(ItemSoundEvent::MISS,
-                        filename, delay);
-                }
-                else if (event == "hurt")
-                {
-                    currentInfo->addSound(ItemSoundEvent::HURT,
-                        filename, delay);
-                }
-                else if (event == "die")
-                {
-                    currentInfo->addSound(ItemSoundEvent::DIE,
-                        filename, delay);
-                }
-                else if (event == "move")
-                {
-                    currentInfo->addSound(ItemSoundEvent::MOVE,
-                        filename, delay);
-                }
-                else if (event == "sit")
-                {
-                    currentInfo->addSound(ItemSoundEvent::SIT,
-                        filename, delay);
-                }
-                else if (event == "sittop")
-                {
-                    currentInfo->addSound(ItemSoundEvent::SITTOP,
-                        filename, delay);
-                }
-                else if (event == "spawn")
-                {
-                    currentInfo->addSound(ItemSoundEvent::SPAWN,
-                        filename, delay);
-                }
-                else
-                {
-                    logger->log("MonsterDB: Warning, sound effect %s for "
-                                "unknown event %s of monster %s",
-                                filename, event.c_str(),
-                                currentInfo->getName().c_str());
-                }
-            }
-            else if (xmlNameEqual(spriteNode, "attack"))
-            {
-                const int attackId = XML::getProperty(spriteNode, "id", 0);
-                const int effectId = XML::getProperty(
-                    spriteNode, "effect-id", paths.getIntValue("effectId"));
-                const int hitEffectId = XML::getProperty(spriteNode,
-                    "hit-effect-id", paths.getIntValue("hitEffectId"));
-                const int criticalHitEffectId = XML::getProperty(spriteNode,
-                    "critical-hit-effect-id",
-                    paths.getIntValue("criticalHitEffectId"));
-                const int missEffectId = XML::getProperty(spriteNode,
-                    "miss-effect-id", paths.getIntValue("missEffectId"));
-
-                const std::string spriteAction = XML::getProperty(
-                    spriteNode, "action", "attack");
-                const std::string skySpriteAction = XML::getProperty(
-                    spriteNode, "skyaction", "skyattack");
-                const std::string waterSpriteAction = XML::getProperty(
-                    spriteNode, "wateraction", "waterattack");
-
-                const std::string missileParticle = XML::getProperty(
-                        spriteNode, "missile-particle", "");
-
-                currentInfo->addAttack(attackId, spriteAction, skySpriteAction,
-                    waterSpriteAction, effectId, hitEffectId,
-                    criticalHitEffectId, missEffectId, missileParticle);
-            }
-            else if (xmlNameEqual(spriteNode, "particlefx"))
-            {
-                if (!spriteNode->xmlChildrenNode)
-                    continue;
-
-                display.particles.push_back(reinterpret_cast<const char*>(
-                    spriteNode->xmlChildrenNode->content));
-            }
+            BeingCommon::readObjectNodes(spriteNode, display,
+                currentInfo, "MonsterDB");
         }
         currentInfo->setDisplay(display);