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/npcdb.cpp | 22 ++-------------------- 1 file changed, 2 insertions(+), 20 deletions(-) (limited to 'src/resources/npcdb.cpp') diff --git a/src/resources/npcdb.cpp b/src/resources/npcdb.cpp index 103bbb805..f9d9295d6 100644 --- a/src/resources/npcdb.cpp +++ b/src/resources/npcdb.cpp @@ -24,6 +24,7 @@ #include "logger.h" +#include "resources/beingcommon.h" #include "resources/beinginfo.h" #include "utils/dtor.h" @@ -90,26 +91,7 @@ void NPCDB::loadXmlFile(const std::string &fileName) currentInfo->setTargetSelection(XML::getBoolProperty(npcNode, "targetSelection", true)); - currentInfo->setTargetCursorSize(XML::getProperty(npcNode, - "targetCursor", "medium")); - - currentInfo->setHoverCursor(XML::getProperty(npcNode, - "hoverCursor", "talk")); - - currentInfo->setTargetOffsetX(XML::getProperty(npcNode, - "targetOffsetX", 0)); - - currentInfo->setTargetOffsetY(XML::getProperty(npcNode, - "targetOffsetY", 0)); - - currentInfo->setNameOffsetX(XML::getProperty(npcNode, - "nameOffsetX", 0)); - - currentInfo->setNameOffsetY(XML::getProperty(npcNode, - "nameOffsetY", 0)); - - currentInfo->setSortOffsetY(XML::getProperty(npcNode, - "sortOffsetY", 0)); + BeingCommon::readBasicAttributes(currentInfo, npcNode, "talk"); currentInfo->setDeadSortOffsetY(XML::getProperty(npcNode, "deadSortOffsetY", 31)); -- cgit v1.2.3-60-g2f50