diff options
| author | Andrei Karas <akaras@inbox.ru> | 2014-09-02 11:59:57 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2014-09-06 01:18:55 +0300 |
| commit | 3f483c84d47d872b51406d841d92ac50f08a190c (patch) | |
| tree | d77b0e1275f4eb5698349c3596e6032a1ef779ee /src/resources | |
| parent | fc13d125d9def0a439eb8604ba97f09caba3659a (diff) | |
| download | manaplus-3f483c84d47d872b51406d841d92ac50f08a190c.tar.gz manaplus-3f483c84d47d872b51406d841d92ac50f08a190c.tar.bz2 manaplus-3f483c84d47d872b51406d841d92ac50f08a190c.tar.xz manaplus-3f483c84d47d872b51406d841d92ac50f08a190c.zip | |
Remove server version check for set item colors palette.
Diffstat (limited to 'src/resources')
| -rw-r--r-- | src/resources/db/itemdb.cpp | 18 |
1 files changed, 4 insertions, 14 deletions
diff --git a/src/resources/db/itemdb.cpp b/src/resources/db/itemdb.cpp index 01b5fc913..9f63048fd 100644 --- a/src/resources/db/itemdb.cpp +++ b/src/resources/db/itemdb.cpp @@ -287,21 +287,11 @@ void ItemDB::loadXmlFile(const std::string &fileName, int &tagNum) std::string useButton = XML::getProperty(node, "useButton", ""); std::string useButton2 = XML::getProperty(node, "useButton2", ""); std::string colors; - if (serverVersion >= 1) - { - colors = XML::getProperty(node, "colors", ""); + colors = XML::getProperty(node, "colors", ""); - // check for empty hair palete - if (colors.empty() && id <= -1 && id > -100) - colors = "hair"; - } - else - { - if (id <= -1 && id > -100) - colors = "hair"; - else - colors.clear(); - } + // check for empty hair palete + if (colors.empty() && id <= -1 && id > -100) + colors = "hair"; std::string tags[3]; tags[0] = XML::getProperty(node, "tag", |