summaryrefslogtreecommitdiff
path: root/src/being
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2017-04-02 06:23:19 +0300
committerAndrei Karas <akaras@inbox.ru>2017-04-03 18:44:58 +0300
commit49631972db5b965413d4bbe36983a8d5bd203183 (patch)
treecb31545521cb4b33e65f8e94e7f2d5cd33e9e7a1 /src/being
parentbe7786e70668c014b19263895a6c8f507ed8161d (diff)
downloadplus-49631972db5b965413d4bbe36983a8d5bd203183.tar.gz
plus-49631972db5b965413d4bbe36983a8d5bd203183.tar.bz2
plus-49631972db5b965413d4bbe36983a8d5bd203183.tar.xz
plus-49631972db5b965413d4bbe36983a8d5bd203183.zip
Use pathJoin for concatinate some paths.
Diffstat (limited to 'src/being')
-rw-r--r--src/being/actorsprite.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/being/actorsprite.cpp b/src/being/actorsprite.cpp
index 0cbb88d99..fc4850e32 100644
--- a/src/being/actorsprite.cpp
+++ b/src/being/actorsprite.cpp
@@ -438,7 +438,7 @@ void ActorSprite::setupSpriteDisplay(const SpriteDisplay &display,
{
if (!*it)
continue;
- const std::string file = paths.getStringValue("sprites").append(
+ const std::string file = pathJoin(paths.getStringValue("sprites"),
combineDye3((*it)->sprite, color));
const int variant = (*it)->variant;
@@ -450,8 +450,8 @@ void ActorSprite::setupSpriteDisplay(const SpriteDisplay &display,
{
if (display.image.empty())
{
- addSprite(AnimatedSprite::delayedLoad(
- paths.getStringValue("sprites").append(
+ addSprite(AnimatedSprite::delayedLoad(pathJoin(
+ paths.getStringValue("sprites"),
paths.getStringValue("spriteErrorFile"))));
}
else
@@ -461,11 +461,11 @@ void ActorSprite::setupSpriteDisplay(const SpriteDisplay &display,
{
case 0:
default:
- imagePath = paths.getStringValue("itemIcons").append(
+ imagePath = pathJoin(paths.getStringValue("itemIcons"),
display.image);
break;
case 1:
- imagePath = paths.getStringValue("itemIcons").append(
+ imagePath = pathJoin(paths.getStringValue("itemIcons"),
display.floor);
break;
}