summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorshennetsind <ind@henn.et>2013-06-14 13:03:40 -0300
committershennetsind <ind@henn.et>2013-06-14 13:03:40 -0300
commit203dd2affa34f90c1ba037d4081494d26613ce4d (patch)
treec474e1b71583a38077d185aafe8ab769adcf1919
parent1c69264cf2f389e887a398b95454761fcb1bb4b6 (diff)
parentf22fada707db4e1e186d331f73fcdbbbc17ebb08 (diff)
downloadhercules-203dd2affa34f90c1ba037d4081494d26613ce4d.tar.gz
hercules-203dd2affa34f90c1ba037d4081494d26613ce4d.tar.bz2
hercules-203dd2affa34f90c1ba037d4081494d26613ce4d.tar.xz
hercules-203dd2affa34f90c1ba037d4081494d26613ce4d.zip
Merge branch 'master' of https://github.com/HerculesWS/Hercules
-rw-r--r--src/map/packets.h4
-rw-r--r--src/map/unit.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/src/map/packets.h b/src/map/packets.h
index 756e053d1..c467090dd 100644
--- a/src/map/packets.h
+++ b/src/map/packets.h
@@ -1968,7 +1968,11 @@ packet(0x020d,-1);
packet(0x0366,90,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
packet(0x0889,6,clif->pGetCharNameRequest,2);
packet(0x0884,6,clif->pSolveCharName,2);
+#ifndef PACKETVER_RE
+ packet(0x091D,18,clif->pPartyBookingRegisterReq,2,4,6);
+#else
packet(0x08E5,41,clif->pPartyBookingRegisterReq,2,4);
+#endif
packet(0x08E6,4);
packet(0x08E7,10,clif->pPartyBookingSearchReq,2);
packet(0x08E8,-1);
diff --git a/src/map/unit.c b/src/map/unit.c
index 7b270adc7..e5637e42d 100644
--- a/src/map/unit.c
+++ b/src/map/unit.c
@@ -327,7 +327,7 @@ int unit_walktoxy( struct block_list *bl, short x, short y, int flag)
path_search(&wpd, bl->m, bl->x, bl->y, x, y, flag&1, CELL_CHKNOPASS); // Count walk path cells
#ifdef OFFICIAL_WALKPATH
if( !path_search_long(NULL, bl->m, bl->x, bl->y, x, y, CELL_CHKNOPASS) // Check if there is an obstacle between
- && (wpd.path_len > 14) // Official number of walkable cells is 14 if and only if there is an obstacle between. [malufett]
+ && (wpd.path_len > (battle_config.max_walk_path/17)*14) // Official number of walkable cells is 14 if and only if there is an obstacle between. [malufett]
&& (bl->type != BL_NPC) ) // If type is a NPC, please disregard.
return 0;
#endif