diff options
| author | shennetsind <shennetsind@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2011-12-21 06:54:57 +0000 |
|---|---|---|
| committer | shennetsind <shennetsind@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2011-12-21 06:54:57 +0000 |
| commit | 9d59b6a3431095b30ab8b2e10205f8a20ab85d9b (patch) | |
| tree | 129fcf643e3d2c9273f8b0b4a71cc3d40eed6d8a /src | |
| parent | 1cd6293a78faa79a0ca9f53d14979c1659a2be5b (diff) | |
| download | hercules-9d59b6a3431095b30ab8b2e10205f8a20ab85d9b.tar.gz hercules-9d59b6a3431095b30ab8b2e10205f8a20ab85d9b.tar.bz2 hercules-9d59b6a3431095b30ab8b2e10205f8a20ab85d9b.tar.xz hercules-9d59b6a3431095b30ab8b2e10205f8a20ab85d9b.zip | |
Fixed GCC "--enable-debug", and 2 compiler warnings that were omitted due to enable-debug being broken.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15197 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src')
| -rw-r--r-- | src/map/clif.c | 1 | ||||
| -rw-r--r-- | src/map/unit.c | 2 |
2 files changed, 1 insertions, 2 deletions
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); |