diff options
author | Andrei Karas <akaras@inbox.ru> | 2017-02-07 20:38:10 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2017-03-24 00:08:35 +0300 |
commit | d1590377de1141144d59ca1160de2822177f6f2a (patch) | |
tree | a368b251dedc7164cadbfe459de4cf5c983acf98 /src/resources/db/itemdb.cpp | |
parent | 65422e722cfe0616c65498c71aa0651857dcc49a (diff) | |
download | plus-d1590377de1141144d59ca1160de2822177f6f2a.tar.gz plus-d1590377de1141144d59ca1160de2822177f6f2a.tar.bz2 plus-d1590377de1141144d59ca1160de2822177f6f2a.tar.xz plus-d1590377de1141144d59ca1160de2822177f6f2a.zip |
Add support for tinyxml2 for reading / writing xml files.
Diffstat (limited to 'src/resources/db/itemdb.cpp')
-rw-r--r-- | src/resources/db/itemdb.cpp | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/resources/db/itemdb.cpp b/src/resources/db/itemdb.cpp index e347528eb..e6affd378 100644 --- a/src/resources/db/itemdb.cpp +++ b/src/resources/db/itemdb.cpp @@ -64,15 +64,15 @@ namespace // Forward declarations static void loadSpriteRef(ItemInfo *const itemInfo, - const XmlNodePtr node) A_NONNULL(1); + XmlNodeConstPtr node) A_NONNULL(1); static void loadSoundRef(ItemInfo *const itemInfo, - const XmlNodePtr node) A_NONNULL(1); + XmlNodeConstPtr node) A_NONNULL(1); static void loadFloorSprite(SpriteDisplay &display, - const XmlNodePtrConst node); + XmlNodeConstPtrConst node); static void loadReplaceSprite(ItemInfo *const itemInfo, - const XmlNodePtr replaceNode) A_NONNULL(1); + XmlNodeConstPtr replaceNode) A_NONNULL(1); static void loadOrderSprite(ItemInfo *const itemInfo, - const XmlNodePtr node, + XmlNodeConstPtr node, const bool drawAfter) A_NONNULL(1); static int parseSpriteName(const std::string &name); static int parseDirectionName(const std::string &name); @@ -125,7 +125,7 @@ static std::string useButton2FromItemType(const ItemDbTypeT &type) } static void readFields(std::string &effect, - const XmlNodePtr node, + XmlNodeConstPtr node, const ItemFieldDb::FieldInfos &fields) { FOR_EACH (ItemFieldDb::FieldInfos::const_iterator, it, fields) @@ -243,7 +243,7 @@ void ItemDB::loadXmlFile(const std::string &fileName, XML::Document doc(fileName, UseVirtFs_true, skipError); - const XmlNodePtrConst rootNode = doc.rootNode(); + XmlNodeConstPtrConst rootNode = doc.rootNode(); if (!rootNode || !xmlNameEqual(rootNode, "items")) { @@ -829,7 +829,7 @@ static int parseDirectionName(const std::string &name) return id; } -static void loadSpriteRef(ItemInfo *const itemInfo, const XmlNodePtr node) +static void loadSpriteRef(ItemInfo *const itemInfo, XmlNodeConstPtr node) { const std::string gender = XML::getProperty(node, "gender", "unisex"); if (!node || !XmlHaveChildContent(node)) @@ -846,7 +846,7 @@ static void loadSpriteRef(ItemInfo *const itemInfo, const XmlNodePtr node) itemInfo->setSprite(filename, Gender::OTHER, race); } -static void loadSoundRef(ItemInfo *const itemInfo, const XmlNodePtr node) +static void loadSoundRef(ItemInfo *const itemInfo, XmlNodeConstPtr node) { if (!node || !XmlHaveChildContent(node)) return; @@ -868,7 +868,7 @@ static void loadSoundRef(ItemInfo *const itemInfo, const XmlNodePtr node) } static void loadFloorSprite(SpriteDisplay &display, - const XmlNodePtrConst floorNode) + XmlNodeConstPtrConst floorNode) { if (!floorNode) return; @@ -892,7 +892,7 @@ static void loadFloorSprite(SpriteDisplay &display, } static void loadReplaceSprite(ItemInfo *const itemInfo, - const XmlNodePtr replaceNode) + XmlNodeConstPtr replaceNode) { if (!replaceNode) return; @@ -1025,7 +1025,7 @@ static void loadReplaceSprite(ItemInfo *const itemInfo, } static void loadOrderSprite(ItemInfo *const itemInfo, - const XmlNodePtr node, + XmlNodeConstPtr node, const bool drawAfter) { const int sprite = parseSpriteName(XML::getProperty(node, "name", "")); |