浏览代码

Fixed GCC "--enable-debug", and 2 compiler warnings that were omitted due to enable-debug being broken.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@15197 54d463be-8e91-2dee-dedb-b68131a5f0ec
shennetsind 13 年之前
父节点
当前提交
4f11432152
共有 3 个文件被更改,包括 4 次插入6 次删除
  1. 3 4
      configure
  2. 0 1
      src/map/clif.c
  3. 1 1
      src/map/unit.c

+ 3 - 4
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;
 

+ 0 - 1
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 )

+ 1 - 1
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);