浏览代码

r16370 has fixed a behavior in *athena that has always made walking easier/smoother, unlike how it actually is meant to be, however since users have been exposed to this behavior for so many years I'm adding a config to disable it in order to save endless posts/bug reports on a intended feature.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16372 54d463be-8e91-2dee-dedb-b68131a5f0ec
shennetsind 13 年之前
父节点
当前提交
1105b7ac17
共有 3 个文件被更改,包括 15 次插入6 次删除
  1. 6 0
      src/map/config/core.h
  2. 2 2
      src/map/skill.c
  3. 7 4
      src/map/unit.c

+ 6 - 0
src/map/config/core.h

@@ -18,6 +18,12 @@
  **/
 #define MAX_SUGGESTIONS 10
 
+//Comment to disable the official walk path
+// -- The official walkpath disables users from taking non-clear walk paths,
+// -- e.g. if they want to get around a obstacle they have to walk around it,
+// -- while with OFFICIAL_WALKPATH disabled if they click to walk around a obstacle the server will do it automatically
+#define OFFICIAL_WALKPATH
+
 /// leave this line uncommented to enable callfunc checks when processing scripts.
 /// while allowed, the script engine will attempt to match user-defined functions
 /// in scripts allowing direct function callback (without the use of callfunc.)

+ 2 - 2
src/map/skill.c

@@ -8823,10 +8823,10 @@ int skill_castend_id(int tid, unsigned int tick, int id, intptr_t data)
 			else
 				skill_consume_requirement(sd,ud->skillid,ud->skilllv,1);
 		}
-
+#ifdef OFFICIAL_WALKPATH
 		if( !path_search_long(NULL, src->m, src->x, src->y, target->x, target->y, CELL_CHKWALL) )
 			break;
-
+#endif
 		if( (src->type == BL_MER || src->type == BL_HOM) && !skill_check_condition_mercenary(src, ud->skillid, ud->skilllv, 1) )
 			break;
 

+ 7 - 4
src/map/unit.c

@@ -322,9 +322,9 @@ int unit_walktoxy( struct block_list *bl, short x, short y, int flag)
 	ud = unit_bl2ud(bl);
 	
 	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;
-
+#endif
 	if (flag&4 && DIFF_TICK(ud->canmove_tick, gettick()) > 0 &&
 		DIFF_TICK(ud->canmove_tick, gettick()) < 2000)
   	{	// 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;
 
 	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
 
 	if( src->m != target->m )