diff options
| author | Andrei Karas <akaras@inbox.ru> | 2016-08-24 02:08:25 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2016-08-24 02:08:25 +0300 |
| commit | de73499f5ae0fa4ca0275e8c720da333e9dc635e (patch) | |
| tree | 9152048a33999ed63fdee21223a378d321ce3898 | |
| parent | f1b5d66496f2f46f6618481bbeea6f33cf82f698 (diff) | |
| download | plus-de73499f5ae0fa4ca0275e8c720da333e9dc635e.tar.gz plus-de73499f5ae0fa4ca0275e8c720da333e9dc635e.tar.bz2 plus-de73499f5ae0fa4ca0275e8c720da333e9dc635e.tar.xz plus-de73499f5ae0fa4ca0275e8c720da333e9dc635e.zip | |
Remove pet id from item db.
| -rw-r--r-- | src/resources/db/itemdb.cpp | 4 | ||||
| -rw-r--r-- | src/resources/iteminfo.cpp | 1 | ||||
| -rw-r--r-- | src/resources/iteminfo.h | 7 |
3 files changed, 0 insertions, 12 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) diff --git a/src/resources/iteminfo.cpp b/src/resources/iteminfo.cpp index 2b501627c..a71cdc448 100644 --- a/src/resources/iteminfo.cpp +++ b/src/resources/iteminfo.cpp @@ -73,7 +73,6 @@ ItemInfo::ItemInfo() : maxFloorOffsetX(mapTileSize), maxFloorOffsetY(mapTileSize), mPickupCursor(Cursor::CURSOR_POINTER), - mPet(0), mProtected(false) { for (int f = 0; f < 10; f ++) diff --git a/src/resources/iteminfo.h b/src/resources/iteminfo.h index fd75a9f30..c61da1bcd 100644 --- a/src/resources/iteminfo.h +++ b/src/resources/iteminfo.h @@ -243,12 +243,6 @@ class ItemInfo final bool isRemoveItemId(int id) const A_WARN_UNUSED; - void setPet(const int pet) - { mPet = pet; } - - int getPet() const - { return mPet; } - void setCardColor(const ItemColor color) { mCardColor = color; } @@ -380,7 +374,6 @@ class ItemInfo final int maxFloorOffsetX; int maxFloorOffsetY; Cursor::Cursor mPickupCursor; - int mPet; bool mProtected; }; |