summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2013-02-18 12:41:59 +0300
committerAndrei Karas <akaras@inbox.ru>2013-02-18 12:41:59 +0300
commite714f084284e14ff8a338d68c15088ab7662a42f (patch)
tree5bf1e5e5888898088063b4aa9fff42baa8bb6ccb
parenta7f558d18bb10042a27be503c329167a856b8a80 (diff)
downloadManaVerse-e714f084284e14ff8a338d68c15088ab7662a42f.tar.gz
ManaVerse-e714f084284e14ff8a338d68c15088ab7662a42f.tar.bz2
ManaVerse-e714f084284e14ff8a338d68c15088ab7662a42f.tar.xz
ManaVerse-e714f084284e14ff8a338d68c15088ab7662a42f.zip
Enable some features for tmw like servers.
Now this features enabled because ManaPlus supported on this servers. Enabled features: race sprites draw npc option for not allow select npc map layer properties.
-rw-r--r--src/resources/iteminfo.cpp9
-rw-r--r--src/resources/mapreader.cpp2
-rw-r--r--src/resources/npcdb.cpp7
3 files changed, 6 insertions, 12 deletions
diff --git a/src/resources/iteminfo.cpp b/src/resources/iteminfo.cpp
index 4b9873a3e..8033ada7b 100644
--- a/src/resources/iteminfo.cpp
+++ b/src/resources/iteminfo.cpp
@@ -89,12 +89,9 @@ const std::string &ItemInfo::getSprite(const Gender gender,
if (i != mAnimationFiles.end())
return i->second;
- if (serverVersion > 0)
- {
- i = mAnimationFiles.find(static_cast<int>(gender));
- if (i != mAnimationFiles.end())
- return i->second;
- }
+ i = mAnimationFiles.find(static_cast<int>(gender));
+ if (i != mAnimationFiles.end())
+ return i->second;
return empty;
}
}
diff --git a/src/resources/mapreader.cpp b/src/resources/mapreader.cpp
index a8388e5a9..cd0b68163 100644
--- a/src/resources/mapreader.cpp
+++ b/src/resources/mapreader.cpp
@@ -486,7 +486,7 @@ void MapReader::readLayer(const XmlNodePtr node, Map *const map)
// Load the tile data
for_each_xml_child_node(childNode, node)
{
- if (serverVersion > 0 && xmlNameEqual(childNode, "properties"))
+ if (xmlNameEqual(childNode, "properties"))
{
for_each_xml_child_node(prop, childNode)
{
diff --git a/src/resources/npcdb.cpp b/src/resources/npcdb.cpp
index 9831da06b..6e94bb3c3 100644
--- a/src/resources/npcdb.cpp
+++ b/src/resources/npcdb.cpp
@@ -71,11 +71,8 @@ void NPCDB::load()
BeingInfo *const currentInfo = new BeingInfo;
- if (serverVersion > 0)
- {
- currentInfo->setTargetSelection(XML::getProperty(
- npcNode, "targetSelection", true));
- }
+ currentInfo->setTargetSelection(XML::getProperty(npcNode,
+ "targetSelection", true));
currentInfo->setTargetCursorSize(XML::getProperty(npcNode,
"targetCursor", "medium"));