summaryrefslogtreecommitdiff
path: root/src/net/manaserv
diff options
context:
space:
mode:
authorYohann Ferreira <yohann_dot_ferreira_at_orange_dot_efer>2011-06-22 18:58:47 +0200
committerYohann Ferreira <yohann_dot_ferreira_at_orange_dot_efer>2011-06-22 18:58:47 +0200
commit852ff45c35c422b5264487669934b392a8657465 (patch)
tree380751fae34a7dcd7b31bd84e303b9086eb17485 /src/net/manaserv
parent2a11c6c5d874d661dcb7f016183c3c3e64e65f3c (diff)
parentec3c689c64922baf4a9f99bc6e9345e0a80403e8 (diff)
downloadmana-client-852ff45c35c422b5264487669934b392a8657465.tar.gz
mana-client-852ff45c35c422b5264487669934b392a8657465.tar.bz2
mana-client-852ff45c35c422b5264487669934b392a8657465.tar.xz
mana-client-852ff45c35c422b5264487669934b392a8657465.zip
Merge branch 'master' of gitorious.org:~bertram/mana/mana-any-square-tile-size
Diffstat (limited to 'src/net/manaserv')
-rw-r--r--src/net/manaserv/playerhandler.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/net/manaserv/playerhandler.cpp b/src/net/manaserv/playerhandler.cpp
index 4249bac8..a114da3d 100644
--- a/src/net/manaserv/playerhandler.cpp
+++ b/src/net/manaserv/playerhandler.cpp
@@ -46,12 +46,11 @@
#include "net/manaserv/attributes.h"
/**
- * Max. distance we are willing to scroll after a teleport;
+ * Max. distance in tiles we are willing to scroll after a teleport;
* everything beyond will reset the port hard.
- * 32 is the nominal tile width/height.
* @todo: Make this parameter read from config.
*/
-static const int MAP_TELEPORT_SCROLL_DISTANCE = 8 * 32;
+const int MAP_TELEPORT_SCROLL_DISTANCE = 256;
extern Net::PlayerHandler *playerHandler;