From 9e72886ee15acc39cbb6075ce32a60a5391ea9f3 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Mon, 3 Apr 2017 02:12:42 +0300 Subject: Replace string::append with pathJoin. --- src/resources/db/emotedb.cpp | 16 ++++++++-------- src/resources/db/horsedb.cpp | 8 ++++---- 2 files changed, 12 insertions(+), 12 deletions(-) (limited to 'src/resources/db') diff --git a/src/resources/db/emotedb.cpp b/src/resources/db/emotedb.cpp index 8fddc0a19..7d9e47e8b 100644 --- a/src/resources/db/emotedb.cpp +++ b/src/resources/db/emotedb.cpp @@ -50,8 +50,8 @@ void EmoteDB::load() unload(); EmoteSprite *const unknownSprite = new EmoteSprite; - unknownSprite->sprite = AnimatedSprite::load(paths.getStringValue( - "sprites").append(paths.getStringValue( + unknownSprite->sprite = AnimatedSprite::load(pathJoin(paths.getStringValue( + "sprites"), paths.getStringValue( "spriteErrorFile"))); unknownSprite->name = "unknown"; unknownSprite->id = 0; @@ -126,9 +126,9 @@ void EmoteDB::loadXmlFile(const std::string &fileName, if (xmlNameEqual(spriteNode, "sprite")) { EmoteSprite *const currentSprite = new EmoteSprite; - currentSprite->sprite = AnimatedSprite::load( - paths.getStringValue("sprites").append(std::string( - XmlChildContent(spriteNode))), + currentSprite->sprite = AnimatedSprite::load(pathJoin( + paths.getStringValue("sprites"), + XmlChildContent(spriteNode)), XML::getProperty(spriteNode, "variant", 0)); currentSprite->name = XML::langProperty( spriteNode, "name", ""); @@ -199,9 +199,9 @@ void EmoteDB::loadSpecialXmlFile(const std::string &fileName, if (xmlNameEqual(spriteNode, "sprite")) { EmoteSprite *const currentSprite = new EmoteSprite; - currentSprite->sprite = AnimatedSprite::load( - paths.getStringValue("sprites").append(std::string( - XmlChildContent(spriteNode))), + currentSprite->sprite = AnimatedSprite::load(pathJoin( + paths.getStringValue("sprites"), + XmlChildContent(spriteNode)), XML::getProperty(spriteNode, "variant", 0)); currentSprite->name = XML::langProperty( spriteNode, "name", ""); diff --git a/src/resources/db/horsedb.cpp b/src/resources/db/horsedb.cpp index 1eab6ada7..a6b395d3f 100644 --- a/src/resources/db/horsedb.cpp +++ b/src/resources/db/horsedb.cpp @@ -43,8 +43,8 @@ namespace #define loadSprite(name) \ { \ SpriteReference *const currentSprite = new SpriteReference; \ - currentSprite->sprite = paths.getStringValue("sprites").append( \ - std::string(XmlChildContent(spriteNode))); \ + currentSprite->sprite = pathJoin(paths.getStringValue("sprites"), \ + XmlChildContent(spriteNode)); \ currentSprite->variant = XML::getProperty( \ spriteNode, "variant", 0); \ currentInfo->name.push_back(currentSprite); \ @@ -62,13 +62,13 @@ void HorseDB::load() unload(); SpriteReference *currentSprite = new SpriteReference; - currentSprite->sprite = paths.getStringValue("sprites").append( + currentSprite->sprite = pathJoin(paths.getStringValue("sprites"), paths.getStringValue("spriteErrorFile")); currentSprite->variant = 0; mUnknown.downSprites.push_back(currentSprite); currentSprite = new SpriteReference; - currentSprite->sprite = paths.getStringValue("sprites").append( + currentSprite->sprite = pathJoin(paths.getStringValue("sprites"), paths.getStringValue("spriteErrorFile")); currentSprite->variant = 0; mUnknown.upSprites.push_back(currentSprite); -- cgit v1.2.3-70-g09d2