diff options
author | Streusel <advance_me@hotmail.de> | 2013-02-21 16:49:52 -0800 |
---|---|---|
committer | Streusel <advance_me@hotmail.de> | 2013-02-21 16:49:52 -0800 |
commit | 6165590a1a68653ad1fa3dd14306a2e64dc9c5c9 (patch) | |
tree | 01c1d41bfbca9964046fb05135bd17105da7f34c /src/map/unit.c | |
parent | 803169a68c6b3dcf9d0db07b479d4bad65894603 (diff) | |
parent | 84926b94e869a19f08a7a25df15b4c677316cd32 (diff) | |
download | hercules-6165590a1a68653ad1fa3dd14306a2e64dc9c5c9.tar.gz hercules-6165590a1a68653ad1fa3dd14306a2e64dc9c5c9.tar.bz2 hercules-6165590a1a68653ad1fa3dd14306a2e64dc9c5c9.tar.xz hercules-6165590a1a68653ad1fa3dd14306a2e64dc9c5c9.zip |
Merge branch 'master' of github.com:HerculesWS/Hercules
Diffstat (limited to 'src/map/unit.c')
-rw-r--r-- | src/map/unit.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/src/map/unit.c b/src/map/unit.c index 4ca64d7f8..388c3757d 100644 --- a/src/map/unit.c +++ b/src/map/unit.c @@ -353,8 +353,6 @@ int unit_walktoxy( struct block_list *bl, short x, short y, int flag) map_random_dir(bl, &ud->to_x, &ud->to_y); if(ud->walktimer != INVALID_TIMER) { - if( !battle_config.skill_trap_type && sc && map_flag_gvg(bl->m) && sc->data[SC_ANKLE] ) // Ankle disallows you from changing your path - return 0; // When you come to the center of the grid because the change of destination while you're walking right now // Call a function from a timer unit_walktoxy_sub ud->state.change_walk_target = 1; @@ -430,8 +428,6 @@ int unit_walktobl(struct block_list *bl, struct block_list *tbl, int range, int map_random_dir(bl, &ud->to_x, &ud->to_y); if(ud->walktimer != INVALID_TIMER) { - if( !battle_config.skill_trap_type && sc && map_flag_gvg(bl->m) && sc->data[SC_ANKLE] ) // Ankle disallows you from changing your path - return 0; ud->state.change_walk_target = 1; set_mobstate(bl, flag&2); return 1; @@ -938,8 +934,6 @@ int unit_can_move(struct block_list *bl) { ) return 0; - if( sc->data[SC_ANKLE] && ( battle_config.skill_trap_type || ( !map_flag_gvg(bl->m) && !unit_is_walking(bl) ) ) ) // Ankle only stops you after you're done moving - return 0; if (sc->opt1 > 0 && sc->opt1 != OPT1_STONEWAIT && sc->opt1 != OPT1_BURNING && !(sc->opt1 == OPT1_CRYSTALIZE && bl->type == BL_MOB)) return 0; |