- Fixed skill usage being blocked if you use Weapon Refine and there is nothing available to upgrade.

git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@9839 54d463be-8e91-2dee-dedb-b68131a5f0ec

2 files changed, 8 insertions, 7 deletions

diff --git a/src/map/clif.c b/src/map/clif.c
index c8c021233..535a215eb 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -5372,9 +5372,10 @@ int clif_item_refine_list(struct map_session_data *sd)
 	}
 	WFIFOW(fd,2)=c*13+4;
 	WFIFOSET(fd,WFIFOW(fd,2));
-	sd->menuskill_id = WS_WEAPONREFINE;
-	sd->menuskill_lv = skilllv;
-
+	if (c > 0) {
+		sd->menuskill_id = WS_WEAPONREFINE;
+		sd->menuskill_lv = skilllv;
+	}
 	return 0;
 }
 
diff --git a/src/map/unit.c b/src/map/unit.c
index 18fffa7f5..7383aed1c 100644
--- a/src/map/unit.c
+++ b/src/map/unit.c
@@ -312,7 +312,7 @@ int unit_walktoxy( struct block_list *bl, int x, int y, int flag) {
 		return 1;
 	}
 
-	if (ud->attacktimer != -1) {
+	if(ud->attacktimer != -1) {
 		delete_timer( ud->attacktimer, unit_attack_timer );
 		ud->attacktimer = -1;
 	}
@@ -373,16 +373,16 @@ int unit_walktobl(struct block_list *bl, struct block_list *tbl, int range, int
 		return 1;
 	}
 
-	if (DIFF_TICK(ud->canmove_tick, gettick()) > 0)
+	if(DIFF_TICK(ud->canmove_tick, gettick()) > 0)
 	{	//Can't move, wait a bit before invoking the movement.
 		add_timer(ud->canmove_tick+1, unit_walktobl_sub, bl->id, ud->target);
 		return 1;
 	}
 
-	if (!unit_can_move(bl))
+	if(!unit_can_move(bl))
 		return 0;
 
-	if (ud->attacktimer != -1) {
+	if(ud->attacktimer != -1) {
 		delete_timer( ud->attacktimer, unit_attack_timer );
 		ud->attacktimer = -1;
 	}