Mirroristas/rathena
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Fixed #101 - Warg Dash not beginning run action when used.

Browse Source
This commit is contained in:
aleos89 2014-11-12 08:43:27 -05:00
parent ccebc42dc6
commit b28e9dc9dd
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/map/unit.c
View File

@ -802,8 +802,7 @@ void unit_run_hit(struct block_list *bl, struct status_change *sc, struct map_se
* @param sd: Required only when using SC_WUGDASH * @param sd: Required only when using SC_WUGDASH
* @return true: Success (Finished running) false: Fail (Hit an object/Couldn't run) * @return true: Success (Finished running) false: Fail (Hit an object/Couldn't run)
*/ */
bool unit_run(struct block_list *bl, struct map_session_data *sd, enum sc_type type) bool unit_run(struct block_list *bl, struct map_session_data *sd, enum sc_type type) {
{
struct status_change *sc; struct status_change *sc;
short to_x, to_y, dir_x, dir_y; short to_x, to_y, dir_x, dir_y;
int i; int i;
@ -812,7 +811,7 @@ bool unit_run(struct block_list *bl, struct map_session_data *sd, enum sc_type t
sc = status_get_sc(bl); sc = status_get_sc(bl);
if (!(sc && sc->data[SC_RUN])) if (!(sc && sc->data[type]))
return false; return false;
if (!unit_can_move(bl)) { if (!unit_can_move(bl)) {
@ -919,12 +918,12 @@ int unit_movepos(struct block_list *bl, short dst_x, short dst_y, int easy, bool
dx = dst_x - bl->x; dx = dst_x - bl->x;
dy = dst_y - bl->y; dy = dst_y - bl->y;
map_foreachinmovearea(clif_outsight, bl, AREA_SIZE, dx, dy, sd?BL_ALL:BL_PC, bl); map_foreachinmovearea(clif_outsight, bl, AREA_SIZE, dx, dy, (sd ? BL_ALL : BL_PC), bl);
map_moveblock(bl, dst_x, dst_y, gettick()); map_moveblock(bl, dst_x, dst_y, gettick());
ud->walktimer = CLIF_WALK_TIMER; // Arbitrary non-INVALID_TIMER value to make the clif code send walking packets ud->walktimer = CLIF_WALK_TIMER; // Arbitrary non-INVALID_TIMER value to make the clif code send walking packets
map_foreachinmovearea(clif_insight, bl, AREA_SIZE, -dx, -dy, sd?BL_ALL:BL_PC, bl); map_foreachinmovearea(clif_insight, bl, AREA_SIZE, -dx, -dy, (sd ? BL_ALL : BL_PC), bl);
ud->walktimer = INVALID_TIMER; ud->walktimer = INVALID_TIMER;
if(sd) { if(sd) {