diff options
| -rw-r--r-- | conf/battle/misc.conf | 4 | ||||
| -rwxr-xr-x | configure | 2 | ||||
| -rw-r--r-- | src/map/battle.c | 1 | ||||
| -rw-r--r-- | src/map/battle.h | 1 | ||||
| -rw-r--r-- | src/map/unit.c | 2 |
5 files changed, 8 insertions, 2 deletions
diff --git a/conf/battle/misc.conf b/conf/battle/misc.conf index b9aaa2356..7d797d2eb 100644 --- a/conf/battle/misc.conf +++ b/conf/battle/misc.conf @@ -90,6 +90,10 @@ duel_only_on_same_map: no official_cell_stack_limit: 1 custom_cell_stack_limit: 1 +// If 0 while walking not check occupied cells +// If 1 while walking check occupied cells +check_occupied_cells: 1 + // Allow autotrade only in map with autotrade flag? // Set this to "no" will allow autotrade where no "autotrade" mapflag is set // Set this to "yes" to only allow autotrade on maps with "autotrade" mapflag @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.in 35e1da2. +# From configure.in bc3bdec. # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.69. # diff --git a/src/map/battle.c b/src/map/battle.c index f5357f94a..b2ee9cf1d 100644 --- a/src/map/battle.c +++ b/src/map/battle.c @@ -6728,6 +6728,7 @@ static const struct battle_data { { "official_cell_stack_limit", &battle_config.official_cell_stack_limit, 1, 0, 255, }, { "custom_cell_stack_limit", &battle_config.custom_cell_stack_limit, 1, 1, 255, }, { "dancing_weaponswitch_fix", &battle_config.dancing_weaponswitch_fix, 1, 0, 1, }, + { "check_occupied_cells", &battle_config.check_occupied_cells, 1, 0, 1, }, // eAthena additions { "item_logarithmic_drops", &battle_config.logarithmic_drops, 0, 0, 1, }, diff --git a/src/map/battle.h b/src/map/battle.h index ddd98ec69..233c325cf 100644 --- a/src/map/battle.h +++ b/src/map/battle.h @@ -384,6 +384,7 @@ struct Battle_Config { int skill_wall_check; // [Skotlex] int official_cell_stack_limit; // [Playtester] int custom_cell_stack_limit; // [Skotlex] + int check_occupied_cells; // [4144] int skill_caster_check; // [Skotlex] int sc_castcancel; // [Skotlex] int pc_sc_def_rate; // [Skotlex] diff --git a/src/map/unit.c b/src/map/unit.c index b8e84492b..2e96e9c20 100644 --- a/src/map/unit.c +++ b/src/map/unit.c @@ -493,7 +493,7 @@ int unit_walktoxy( struct block_list *bl, short x, short y, int flag) if( ud == NULL) return 0; - if ((flag&8) && !map->closest_freecell(bl->m, &x, &y, BL_CHAR|BL_NPC, 1)) //This might change x and y + if (battle_config.check_occupied_cells && (flag&8) && !map->closest_freecell(bl->m, &x, &y, BL_CHAR|BL_NPC, 1)) //This might change x and y return 0; if (!path->search(&wpd, bl->m, bl->x, bl->y, x, y, flag&1, CELL_CHKNOPASS)) // Count walk path cells |