diff options
| -rwxr-xr-x | configure | 7 | ||||
| -rw-r--r-- | src/map/clif.c | 1 | ||||
| -rw-r--r-- | src/map/unit.c | 2 |
3 files changed, 4 insertions, 6 deletions
@@ -1405,9 +1405,8 @@ else fi; # -# debug +# BuildBot # -# Check whether --enable-debug or --disable-debug was given. if test "${enable_buildbot+set}" = set; then enableval="$enable_buildbot" @@ -1416,12 +1415,12 @@ if test "${enable_buildbot+set}" = set; then "no");; "yes");; *) { { echo "$as_me:$LINENO: error: invalid argument --enable-buildbot=$enableval... stopping" >&5 -echo "$as_me: error: invalid argument --enable-debug=$enableval... stopping" >&2;} +echo "$as_me: error: invalid argument --enable-buildbot=$enableval... stopping" >&2;} { (exit 1); exit 1; }; };; esac else - enable_debug="no" + enable_buildbot="no" fi; diff --git a/src/map/clif.c b/src/map/clif.c index 3c1851309..a471bfc06 100644 --- a/src/map/clif.c +++ b/src/map/clif.c @@ -13607,7 +13607,6 @@ void clif_cashshop_ack(struct map_session_data* sd, int error) void clif_parse_cashshop_buy(int fd, struct map_session_data *sd) { int fail = 0; - struct npc_data *nd; nullpo_retv(sd); if( sd->state.trading || !sd->npc_shopid ) diff --git a/src/map/unit.c b/src/map/unit.c index e7f7fffce..9471f6a9d 100644 --- a/src/map/unit.c +++ b/src/map/unit.c @@ -462,7 +462,7 @@ int unit_run(struct block_list *bl) to_y += dir_y; } - if(to_x == bl->x && to_y == bl->y || (to_x == (bl->x+1) || to_y == (bl->y+1)) || (to_x == (bl->x-1) || to_y == (bl->y-1))) { + if( (to_x == bl->x && to_y == bl->y ) || (to_x == (bl->x+1) || to_y == (bl->y+1)) || (to_x == (bl->x-1) || to_y == (bl->y-1))) { //If you can't run forward, you must be next to a wall, so bounce back. [Skotlex] clif_status_change(bl, SI_BUMP, 1, 0, 0, 0, 0); |