summaryrefslogtreecommitdiff
path: root/src/resources/db/emotedb.cpp
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2017-04-03 02:12:42 +0300
committerAndrei Karas <akaras@inbox.ru>2017-04-03 18:44:58 +0300
commit9e72886ee15acc39cbb6075ce32a60a5391ea9f3 (patch)
treefd7d0b05eeaed5ab0016cad58772cab7456f36b4 /src/resources/db/emotedb.cpp
parent49631972db5b965413d4bbe36983a8d5bd203183 (diff)
downloadmv-9e72886ee15acc39cbb6075ce32a60a5391ea9f3.tar.gz
mv-9e72886ee15acc39cbb6075ce32a60a5391ea9f3.tar.bz2
mv-9e72886ee15acc39cbb6075ce32a60a5391ea9f3.tar.xz
mv-9e72886ee15acc39cbb6075ce32a60a5391ea9f3.zip
Replace string::append with pathJoin.
Diffstat (limited to 'src/resources/db/emotedb.cpp')
-rw-r--r--src/resources/db/emotedb.cpp16
1 files changed, 8 insertions, 8 deletions
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", "");