From 3f483c84d47d872b51406d841d92ac50f08a190c Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Tue, 2 Sep 2014 11:59:57 +0300 Subject: Remove server version check for set item colors palette. --- src/resources/db/itemdb.cpp | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) (limited to 'src/resources') 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", -- cgit v1.2.3-60-g2f50