|
@@ -322,9 +322,9 @@ int unit_walktoxy( struct block_list *bl, short x, short y, int flag)
|
|
ud = unit_bl2ud(bl);
|
|
ud = unit_bl2ud(bl);
|
|
|
|
|
|
if( ud == NULL) return 0;
|
|
if( ud == NULL) return 0;
|
|
-
|
|
|
|
|
|
+#ifdef OFFICIAL_WALKPATH
|
|
if( !path_search_long(NULL, bl->m, bl->x, bl->y, x, y, CELL_CHKWALL) ) return 0;
|
|
if( !path_search_long(NULL, bl->m, bl->x, bl->y, x, y, CELL_CHKWALL) ) return 0;
|
|
-
|
|
|
|
|
|
+#endif
|
|
if (flag&4 && DIFF_TICK(ud->canmove_tick, gettick()) > 0 &&
|
|
if (flag&4 && DIFF_TICK(ud->canmove_tick, gettick()) > 0 &&
|
|
DIFF_TICK(ud->canmove_tick, gettick()) < 2000)
|
|
DIFF_TICK(ud->canmove_tick, gettick()) < 2000)
|
|
{ // Delay walking command. [Skotlex]
|
|
{ // Delay walking command. [Skotlex]
|
|
@@ -1714,8 +1714,11 @@ static int unit_attack_timer_sub(struct block_list* src, int tid, unsigned int t
|
|
return 0;
|
|
return 0;
|
|
|
|
|
|
if( status_isdead(src) || status_isdead(target) ||
|
|
if( status_isdead(src) || status_isdead(target) ||
|
|
- battle_check_target(src,target,BCT_ENEMY) <= 0 || !status_check_skilluse(src, target, 0, 0) ||
|
|
|
|
- !path_search_long(NULL, src->m, src->x, src->y, target->x, target->y, CELL_CHKWALL) )
|
|
|
|
|
|
+ battle_check_target(src,target,BCT_ENEMY) <= 0 || !status_check_skilluse(src, target, 0, 0)
|
|
|
|
+#ifdef OFFICIAL_WALKPATH
|
|
|
|
+ || !path_search_long(NULL, src->m, src->x, src->y, target->x, target->y, CELL_CHKWALL)
|
|
|
|
+#endif
|
|
|
|
+ )
|
|
return 0; // can't attack under these conditions
|
|
return 0; // can't attack under these conditions
|
|
|
|
|
|
if( src->m != target->m )
|
|
if( src->m != target->m )
|