summaryrefslogtreecommitdiff
path: root/src/resources/db
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2016-08-24 02:08:25 +0300
committerAndrei Karas <akaras@inbox.ru>2016-08-24 02:08:25 +0300
commitde73499f5ae0fa4ca0275e8c720da333e9dc635e (patch)
tree9152048a33999ed63fdee21223a378d321ce3898 /src/resources/db
parentf1b5d66496f2f46f6618481bbeea6f33cf82f698 (diff)
downloadplus-de73499f5ae0fa4ca0275e8c720da333e9dc635e.tar.gz
plus-de73499f5ae0fa4ca0275e8c720da333e9dc635e.tar.bz2
plus-de73499f5ae0fa4ca0275e8c720da333e9dc635e.tar.xz
plus-de73499f5ae0fa4ca0275e8c720da333e9dc635e.zip
Remove pet id from item db.
Diffstat (limited to 'src/resources/db')
-rw-r--r--src/resources/db/itemdb.cpp4
1 files changed, 0 insertions, 4 deletions
diff --git a/src/resources/db/itemdb.cpp b/src/resources/db/itemdb.cpp
index fc837a26d..c862e6796 100644
--- a/src/resources/db/itemdb.cpp
+++ b/src/resources/db/itemdb.cpp
@@ -305,7 +305,6 @@ void ItemDB::loadXmlFile(const std::string &fileName,
node, "rideattack-action", "");
std::string drawBefore = XML::getProperty(node, "drawBefore", "");
std::string drawAfter = XML::getProperty(node, "drawAfter", "");
- int pet = XML::getProperty(node, "pet", 0);
const int maxFloorOffset = XML::getIntProperty(
node, "maxFloorOffset", mapTileSize, 0, mapTileSize);
const int maxFloorOffsetX = XML::getIntProperty(
@@ -411,9 +410,6 @@ void ItemDB::loadXmlFile(const std::string &fileName,
useButton2 = useButton2FromItemType(itemInfo->getType());
itemInfo->setUseButton2(useButton2);
itemInfo->addTag(mTags["All"]);
- if (!pet && inheritItemInfo)
- pet = inheritItemInfo->getPet();
- itemInfo->setPet(pet);
itemInfo->setProtected(XML::getBoolProperty(
node, "sellProtected", false));
if (cardColor != -1)