move shared code for reading being info attributes to separate class.

Also fix name offsets for pets.

1 files changed, 2 insertions, 20 deletions

diff --git a/src/resources/monsterdb.cpp b/src/resources/monsterdb.cpp
index f3c81d52d..769678ca6 100644
--- a/src/resources/monsterdb.cpp
+++ b/src/resources/monsterdb.cpp
@@ -26,6 +26,7 @@
 
 #include "net/net.h"
 
+#include "resources/beingcommon.h"
 #include "resources/beinginfo.h"
 
 #include "utils/dtor.h"
@@ -98,29 +99,10 @@ void MonsterDB::loadXmlFile(const std::string &fileName)
             // TRANSLATORS: unknown info name
             monsterNode, "name", _("unnamed")));
 
-        currentInfo->setTargetCursorSize(XML::getProperty(monsterNode,
-            "targetCursor", "medium"));
-
-        currentInfo->setHoverCursor(XML::getProperty(monsterNode,
-            "hoverCursor", "attack"));
-
-        currentInfo->setTargetOffsetX(XML::getProperty(monsterNode,
-            "targetOffsetX", 0));
-
-        currentInfo->setTargetOffsetY(XML::getProperty(monsterNode,
-            "targetOffsetY", 0));
-
-        currentInfo->setNameOffsetX(XML::getProperty(monsterNode,
-            "nameOffsetX", 0));
-
-        currentInfo->setNameOffsetY(XML::getProperty(monsterNode,
-            "nameOffsetY", 0));
+        BeingCommon::readBasicAttributes(currentInfo, monsterNode, "attack");
 
         currentInfo->setMaxHP(XML::getProperty(monsterNode, "maxHP", 0));
 
-        currentInfo->setSortOffsetY(XML::getProperty(
-            monsterNode, "sortOffsetY", 0));
-
         currentInfo->setDeadSortOffsetY(XML::getProperty(
             monsterNode, "deadSortOffsetY", 31));