summaryrefslogtreecommitdiff
path: root/src/resources
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2011-05-13 22:14:56 +0300
committerAndrei Karas <akaras@inbox.ru>2011-05-13 22:14:56 +0300
commit6b894220f3c029d256f7f15f41ecb2f635d25bde (patch)
treea8c9b891f3f0df44440def2ea755fcf7454ddb32 /src/resources
parentb4cd8029339cac3c577b67bd161b4dd3ab4f1530 (diff)
downloadmanaplus-6b894220f3c029d256f7f15f41ecb2f635d25bde.tar.gz
manaplus-6b894220f3c029d256f7f15f41ecb2f635d25bde.tar.bz2
manaplus-6b894220f3c029d256f7f15f41ecb2f635d25bde.tar.xz
manaplus-6b894220f3c029d256f7f15f41ecb2f635d25bde.zip
Add more MANASERV_SUPPORT defines to disable server type checks, if manaserv disabled.
Fix some compilation warnings.
Diffstat (limited to 'src/resources')
-rw-r--r--src/resources/monsterdb.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/resources/monsterdb.cpp b/src/resources/monsterdb.cpp
index 2f60cd307..75d268c43 100644
--- a/src/resources/monsterdb.cpp
+++ b/src/resources/monsterdb.cpp
@@ -59,8 +59,12 @@ void MonsterDB::load()
return;
}
+#ifdef MANASERV_SUPPORT
int offset = XML::getProperty(rootNode, "offset", Net::getNetworkType() ==
ServerInfo::TMWATHENA ? OLD_TMWATHENA_OFFSET : 0);
+#else
+ int offset = XML::getProperty(rootNode, "offset", OLD_TMWATHENA_OFFSET);
+#endif
//iterate <monster>s
for_each_xml_child_node(monsterNode, rootNode)