summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorshennetsind <shennetsind@54d463be-8e91-2dee-dedb-b68131a5f0ec>2011-12-21 06:54:57 +0000
committershennetsind <shennetsind@54d463be-8e91-2dee-dedb-b68131a5f0ec>2011-12-21 06:54:57 +0000
commit9d59b6a3431095b30ab8b2e10205f8a20ab85d9b (patch)
tree129fcf643e3d2c9273f8b0b4a71cc3d40eed6d8a
parent1cd6293a78faa79a0ca9f53d14979c1659a2be5b (diff)
downloadhercules-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
-rwxr-xr-xconfigure7
-rw-r--r--src/map/clif.c1
-rw-r--r--src/map/unit.c2
3 files changed, 4 insertions, 6 deletions
diff --git a/configure b/configure
index 0c088dfa1..348dcb804 100755
--- a/configure
+++ b/configure
@@ -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);