summaryrefslogtreecommitdiff
path: root/src/resources/db
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2016-02-14 02:29:16 +0300
committerAndrei Karas <akaras@inbox.ru>2016-02-14 02:29:16 +0300
commit6db83b4ee1c20162a9dd31428cbc36ce7405352d (patch)
tree502c13b828500568dbc842469ae44522a1b2ca2c /src/resources/db
parent4e3b36697e96e30008aea877a625d1be1e920073 (diff)
downloadmanaplus-6db83b4ee1c20162a9dd31428cbc36ce7405352d.tar.gz
manaplus-6db83b4ee1c20162a9dd31428cbc36ce7405352d.tar.bz2
manaplus-6db83b4ee1c20162a9dd31428cbc36ce7405352d.tar.xz
manaplus-6db83b4ee1c20162a9dd31428cbc36ce7405352d.zip
Dont check and modify floor item position if server support haveExtendedDropsPosition.
Also add for legacy servers support for maxFloorOffsetX/Y.
Diffstat (limited to 'src/resources/db')
-rw-r--r--src/resources/db/itemdb.cpp7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/resources/db/itemdb.cpp b/src/resources/db/itemdb.cpp
index d07301e88..e953aa433 100644
--- a/src/resources/db/itemdb.cpp
+++ b/src/resources/db/itemdb.cpp
@@ -320,6 +320,10 @@ void ItemDB::loadXmlFile(const std::string &fileName, int &tagNum)
int pet = XML::getProperty(node, "pet", 0);
const int maxFloorOffset = XML::getIntProperty(
node, "maxFloorOffset", mapTileSize, 0, mapTileSize);
+ const int maxFloorOffsetX = XML::getIntProperty(
+ node, "maxFloorOffsetX", maxFloorOffset, 0, mapTileSize);
+ const int maxFloorOffsetY = XML::getIntProperty(
+ node, "maxFloorOffsetY", maxFloorOffset, 0, mapTileSize);
std::string useButton = XML::langProperty(node, "useButton", "");
std::string useButton2 = XML::langProperty(node, "useButton2", "");
std::string colors = XML::getProperty(node, "colors", "");
@@ -500,7 +504,8 @@ void ItemDB::loadXmlFile(const std::string &fileName, int &tagNum)
if (iconColors.empty() && inheritItemInfo)
iconColors = inheritItemInfo->getIconColorsListName();
itemInfo->setIconColorsList(iconColors);
- itemInfo->setMaxFloorOffset(maxFloorOffset);
+ itemInfo->setMaxFloorOffsetX(maxFloorOffsetX);
+ itemInfo->setMaxFloorOffsetY(maxFloorOffsetY);
itemInfo->setPickupCursor(XML::getProperty(
node, "pickupCursor", "pickup"));