summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYohann Ferreira <yohann_dot_ferreira_at_orange_dot_efer>2011-01-10 20:46:58 +0100
committerYohann Ferreira <yohann_dot_ferreira_at_orange_dot_efer>2011-01-10 20:46:58 +0100
commite0f98a1650a844a5941b5cb0c11a8097f86903cc (patch)
treec97828ab3c1aac340a25ccc0e6b7abfb8925d039
parent59a01fcf92ce43caf6b385659deddfa49c086ee8 (diff)
downloadmana-e0f98a1650a844a5941b5cb0c11a8097f86903cc.tar.gz
mana-e0f98a1650a844a5941b5cb0c11a8097f86903cc.tar.bz2
mana-e0f98a1650a844a5941b5cb0c11a8097f86903cc.tar.xz
mana-e0f98a1650a844a5941b5cb0c11a8097f86903cc.zip
Remove the player naturally avoid other beings for Manaserv.
It could lead to (even small) curious desyncs making things worse to debug. Trivial.
-rw-r--r--src/map.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/map.cpp b/src/map.cpp
index ea5cc976..09782699 100644
--- a/src/map.cpp
+++ b/src/map.cpp
@@ -33,6 +33,8 @@
#include "resources/image.h"
#include "resources/resourcemanager.h"
+#include "net/net.h"
+
#include "utils/dtor.h"
#include "utils/stringutils.h"
@@ -854,7 +856,9 @@ Path Map::findPath(int startX, int startY, int destX, int destY,
// It costs extra to walk through a being (needs to be enough
// to make it more attractive to walk around).
- if (occupied(x, y))
+ // N.B.: Specific to TmwAthena for now.
+ if (Net::getNetworkType() == ServerInfo::TMWATHENA &&
+ occupied(x, y))
{
Gcost += 3 * basicCost;
}