diff options
| author | Michieru <Michieru@users.noreply.github.com> | 2014-08-10 17:30:55 +0200 |
|---|---|---|
| committer | Michieru <Michieru@users.noreply.github.com> | 2014-08-10 17:30:55 +0200 |
| commit | bd34793889e7d49e6650f831e036c0855b56b9fa (patch) | |
| tree | 49eaeff3bd5ae7bc1d0ba0f5db04be545e2925a5 /src | |
| parent | 3089a7d2d2dc655fb955b90ec152c0ba569bd4e2 (diff) | |
| download | hercules-bd34793889e7d49e6650f831e036c0855b56b9fa.tar.gz hercules-bd34793889e7d49e6650f831e036c0855b56b9fa.tar.bz2 hercules-bd34793889e7d49e6650f831e036c0855b56b9fa.tar.xz hercules-bd34793889e7d49e6650f831e036c0855b56b9fa.zip | |
- Fix makes knockback default to the left
- Fix Back Sliding should not have animation
Diffstat (limited to 'src')
| -rw-r--r-- | src/map/clif.c | 2 | ||||
| -rw-r--r-- | src/map/map.c | 4 | ||||
| -rw-r--r-- | src/map/path.c | 7 | ||||
| -rw-r--r-- | src/map/skill.c | 1 |
4 files changed, 7 insertions, 7 deletions
diff --git a/src/map/clif.c b/src/map/clif.c index e6a677a6f..afc9fa314 100644 --- a/src/map/clif.c +++ b/src/map/clif.c @@ -1724,7 +1724,7 @@ void clif_changemapserver(struct map_session_data* sd, unsigned short map_index, void clif_blown(struct block_list *bl) { //Aegis packets says fixpos, but it's unsure whether slide works better or not. -// clif_fixpos(bl); + clif->fixpos(bl); clif->slide(bl, bl->x, bl->y); } diff --git a/src/map/map.c b/src/map/map.c index 62d1aad75..b26d50fc9 100644 --- a/src/map/map.c +++ b/src/map/map.c @@ -2414,8 +2414,8 @@ uint8 map_calc_dir(struct block_list* src, int16 x, int16 y) dy = y-src->y; if( dx == 0 && dy == 0 ) { // both are standing on the same spot - //dir = 6; // aegis-style, makes knockback default to the left - dir = unit->getdir(src); // athena-style, makes knockback default to behind 'src' + dir = 6; // aegis-style, makes knockback default to the left + //dir = unit->getdir(src); // athena-style, makes knockback default to behind 'src' } else if( dx >= 0 && dy >=0 ) { // upper-right diff --git a/src/map/path.c b/src/map/path.c index e90b26db5..f49ce9ecd 100644 --- a/src/map/path.c +++ b/src/map/path.c @@ -86,12 +86,11 @@ int path_blownpos(int16 m,int16 x0,int16 y0,int16 dx,int16 dy,int count) } while( count > 0 && (dx != 0 || dy != 0) ) { - if( !md->getcellp(md,x0+dx,y0+dy,CELL_CHKPASS) ) { + if( !md->getcellp(md,x0+dx,y0+dy,CELL_CHKPASS) ) break; - } - x0 += dx; - y0 += dy; + x0 += dx;
+ y0 += dy;
count--; } diff --git a/src/map/skill.c b/src/map/skill.c index 0e7f8f9a7..e71c0a045 100644 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -6912,6 +6912,7 @@ int skill_castend_nodamage_id(struct block_list *src, struct block_list *bl, uin case TF_BACKSLIDING: //This is the correct implementation as per packet logging information. [Skotlex] clif->skill_nodamage(src,bl,skill_id,skill_lv,1); skill->blown(src,bl,skill->get_blewcount(skill_id,skill_lv),unit->getdir(bl),0); + clif->fixpos(bl); break; case TK_HIGHJUMP: |