From ff5c22d4c0ae27e1bd66a4dd73d0f6a433a47d63 Mon Sep 17 00:00:00 2001 From: Ahmed Samy Date: Tue, 12 Nov 2013 17:15:09 +0200 Subject: [PATCH] Tiny fix Saving newly made houses by the map editor is not even supported, so this is not a bug --- src/client/itemtype.cpp | 3 +-- src/client/thingtypemanager.cpp | 3 +-- src/client/tile.h | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/client/itemtype.cpp b/src/client/itemtype.cpp index 89d54072..4f8e0e0f 100644 --- a/src/client/itemtype.cpp +++ b/src/client/itemtype.cpp @@ -61,8 +61,7 @@ void ItemType::unserialize(const BinaryTreePtr& node) g_things.addItemType(tmp); } } - } - if(g_game.getProtocolVersion() >= 960) { + } else { if(serverId > 30000 && serverId < 30100) { serverId -= 30000; } else if(lastId > 99 && lastId != serverId - 1) { diff --git a/src/client/thingtypemanager.cpp b/src/client/thingtypemanager.cpp index c8b4cd7b..00baebf1 100644 --- a/src/client/thingtypemanager.cpp +++ b/src/client/thingtypemanager.cpp @@ -240,8 +240,7 @@ void ThingTypeManager::parseItemType(uint16 id, TiXmlElement* elem) addItemType(itemType); } else itemType = getItemType(serverId); - } - if(g_game.getProtocolVersion() >= 960) { + } else { if(serverId > 30000 && serverId < 30100) { serverId -= 30000; diff --git a/src/client/tile.h b/src/client/tile.h index 498cd314..0ef41506 100644 --- a/src/client/tile.h +++ b/src/client/tile.h @@ -119,7 +119,7 @@ public: void setHouseId(uint32 hid) { m_houseId = hid; } uint32 getHouseId() { return m_houseId; } - bool isHouseTile() const { return m_houseId != 0 || (m_flags & TILESTATE_HOUSE) == TILESTATE_HOUSE; } + bool isHouseTile() const { return m_houseId != 0 && (m_flags & TILESTATE_HOUSE) == TILESTATE_HOUSE; } TilePtr asTile() { return static_self_cast(); }