diff options
| author | Taylor Locke <kisuka@kisuka.com> | 2014-08-12 21:43:49 -0700 |
|---|---|---|
| committer | Taylor Locke <kisuka@kisuka.com> | 2014-08-12 21:43:49 -0700 |
| commit | 2b8d5013ea8ba9904d157c773f12495bbca8ca80 (patch) | |
| tree | 3923ed2b0b14e15aff4b8535eb740ccdf2dc5349 /src/map/map.c | |
| parent | cc69b228908d2f74f97cf9b5763f6b3141fdf0d0 (diff) | |
| download | hercules-2b8d5013ea8ba9904d157c773f12495bbca8ca80.tar.gz hercules-2b8d5013ea8ba9904d157c773f12495bbca8ca80.tar.bz2 hercules-2b8d5013ea8ba9904d157c773f12495bbca8ca80.tar.xz hercules-2b8d5013ea8ba9904d157c773f12495bbca8ca80.zip | |
Battle config option for knockback style when on same tile.
Diffstat (limited to 'src/map/map.c')
| -rw-r--r-- | src/map/map.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/map/map.c b/src/map/map.c index b26d50fc9..0c8c2d949 100644 --- a/src/map/map.c +++ b/src/map/map.c @@ -2413,9 +2413,10 @@ uint8 map_calc_dir(struct block_list* src, int16 x, int16 y) dx = x-src->x; 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' + { // both are standing on the same spot. + // aegis-style, makes knockback default to the left. + // athena-style, makes knockback default to behind 'src'. + dir = (battle_config.knockback_left ? 6 : unit->getdir(src)); } else if( dx >= 0 && dy >=0 ) { // upper-right |