diff options
author | Andrei Karas <akaras@inbox.ru> | 2012-02-19 15:49:45 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2012-02-19 15:49:45 +0300 |
commit | b30a5d2289a0b68410dee5343e148aba88ea4839 (patch) | |
tree | 9d756785b9166ced76675ad3ebe398c09b494a3c /src/resources/itemdb.cpp | |
parent | 9a3a196dbf633a699c26d0227802a42f025c8bfd (diff) | |
parent | 164e4ed5a153ce06badb52f3a5a4dff16c58d7e6 (diff) | |
download | manaverse-b30a5d2289a0b68410dee5343e148aba88ea4839.tar.gz manaverse-b30a5d2289a0b68410dee5343e148aba88ea4839.tar.bz2 manaverse-b30a5d2289a0b68410dee5343e148aba88ea4839.tar.xz manaverse-b30a5d2289a0b68410dee5343e148aba88ea4839.zip |
Merge branch 'master' into stripped
Diffstat (limited to 'src/resources/itemdb.cpp')
-rw-r--r-- | src/resources/itemdb.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/resources/itemdb.cpp b/src/resources/itemdb.cpp index 5fa68a88f..e81700ecc 100644 --- a/src/resources/itemdb.cpp +++ b/src/resources/itemdb.cpp @@ -202,10 +202,10 @@ void ItemDB::load() int weight = XML::getProperty(node, "weight", 0); int view = XML::getProperty(node, "view", 0); - std::string name = XML::getProperty(node, "name", ""); + std::string name = XML::langProperty(node, "name", ""); std::string image = XML::getProperty(node, "image", ""); std::string floor = XML::getProperty(node, "floor", ""); - std::string description = XML::getProperty(node, "description", ""); + std::string description = XML::langProperty(node, "description", ""); std::string attackAction = XML::getProperty(node, "attack-action", ""); std::string drawBefore = XML::getProperty(node, "drawBefore", ""); std::string drawAfter = XML::getProperty(node, "drawAfter", ""); @@ -316,7 +316,7 @@ void ItemDB::load() effect += " / "; effect += strprintf(it->format.c_str(), value); } - std::string temp = XML::getProperty(node, "effect", ""); + std::string temp = XML::langProperty(node, "effect", ""); if (!effect.empty() && !temp.empty()) effect += " / "; effect += temp; |