summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2015-07-28 14:53:23 +0300
committerAndrei Karas <akaras@inbox.ru>2015-07-28 14:53:23 +0300
commit8290f1ab7f54eea8a834155df9a6751ca4682bc9 (patch)
tree944d1a09a740a302ba01f98ce4a8eed89c84d68d
parent009b8bb6528cd3380474dc5ba29903c55c8f6fef (diff)
downloadmanaplus-8290f1ab7f54eea8a834155df9a6751ca4682bc9.tar.gz
manaplus-8290f1ab7f54eea8a834155df9a6751ca4682bc9.tar.bz2
manaplus-8290f1ab7f54eea8a834155df9a6751ca4682bc9.tar.xz
manaplus-8290f1ab7f54eea8a834155df9a6751ca4682bc9.zip
Use variables from paths.xml for team badges file name.
-rw-r--r--src/being/being.cpp6
-rw-r--r--src/defaults.cpp3
2 files changed, 6 insertions, 3 deletions
diff --git a/src/being/being.cpp b/src/being/being.cpp
index 4112ef634..363ff6c5f 100644
--- a/src/being/being.cpp
+++ b/src/being/being.cpp
@@ -3713,9 +3713,9 @@ void Being::showBadges(const bool show)
if (show && mTeamId)
{
mTeamBadge = AnimatedSprite::load(
- strprintf("%steam%d.xml",
- paths.getStringValue("badges").c_str(),
- mTeamId));
+ paths.getStringValue("badges") +
+ paths.getStringValue(strprintf("team%dbadge",
+ mTeamId)));
}
}
diff --git a/src/defaults.cpp b/src/defaults.cpp
index 630120cff..0a1983558 100644
--- a/src/defaults.cpp
+++ b/src/defaults.cpp
@@ -601,6 +601,9 @@ DefaultsData* getPathsDefaults()
AddDEF("cartEffectName", "cart");
AddDEF("ridingEffectName", "riding");
AddDEF("gmTabMinimalLevel", "2");
+ AddDEF("team1badge", "team1.xml");
+ AddDEF("team2badge", "team2.xml");
+ AddDEF("team3badge", "team3.xml");
return configData;
}