From 4de24231be93c6194801c8962d7bf00ed6c339ff Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Thu, 18 Jul 2013 19:20:57 +0300 Subject: move shared code for reading being info attributes to separate class. Also fix name offsets for pets. --- src/resources/monsterdb.cpp | 22 ++-------------------- 1 file changed, 2 insertions(+), 20 deletions(-) (limited to 'src/resources/monsterdb.cpp') 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)); -- cgit v1.2.3-70-g09d2