From 41fcb2ac66e37cad97e9ec485bd4d11f8397e53b Mon Sep 17 00:00:00 2001
From: toms <toms@54d463be-8e91-2dee-dedb-b68131a5f0ec>
Date: Sat, 19 Aug 2006 10:38:14 +0000
Subject: Some compilation warnings fixed

git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@8360 54d463be-8e91-2dee-dedb-b68131a5f0ec
---
 Changelog-Trunk.txt | 1 +
 src/map/mercenary.c | 3 +++
 src/map/skill.c     | 1 -
 src/map/status.c    | 3 +--
 4 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index cb6af50de..055bd0776 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -4,6 +4,7 @@ AS OF SVN REV. 5091, WE ARE NOW USING TRUNK.  ALL UNTESTED BUGFIXES/FEATURES GO
 IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
 
 2006/08/19
+	* Some compilation warnings fixed [Toms]
 	* Added skill's required item check on homunc skills [Toms]
 	* Add Condensed Red Potion as a required item for HLIF_HEAL [Toms]
 2006/08/18
diff --git a/src/map/mercenary.c b/src/map/mercenary.c
index 5c3378540..118bda037 100644
--- a/src/map/mercenary.c
+++ b/src/map/mercenary.c
@@ -427,6 +427,8 @@ void merc_save(struct homun_data *hd)
 	intif_homunculus_requestsave(sd->status.account_id, &sd->homunculus) ;
 }
 
+#if 0
+// Not currently used [Toms]
 static int merc_calc_pos(struct homun_data *hd,int tx,int ty,int dir)	//[orn]
 {
 	int x,y,dx,dy;
@@ -480,6 +482,7 @@ static int merc_calc_pos(struct homun_data *hd,int tx,int ty,int dir)	//[orn]
 	hd->ud.to_y = y;
 	return 0;
 }
+#endif
 
 int merc_menu(struct map_session_data *sd,int menunum)
 {
diff --git a/src/map/skill.c b/src/map/skill.c
index 23b6a780c..ec464c961 100644
--- a/src/map/skill.c
+++ b/src/map/skill.c
@@ -2435,7 +2435,6 @@ static int skill_check_condition_hom (struct homun_data *hd, int skill, int lv,
 
 	if (checkitem_flag) {
 		for(i=0;i<10;i++) {
-			int x = lv%11 - 1;
 			index[i] = -1;
 			if(itemid[i] <= 0)
 				continue;
diff --git a/src/map/status.c b/src/map/status.c
index f40e39c9b..29027724e 100644
--- a/src/map/status.c
+++ b/src/map/status.c
@@ -6795,7 +6795,7 @@ static int status_natural_heal(DBKey key,void * data,va_list app)
 	struct status_change *sc;
 	struct unit_data *ud;
 	struct map_session_data *sd;
-	int val,rate,bonus,flag;
+	int val,rate,bonus = 0,flag;
 
 	if (!(bl->type&BL_REGEN))
 		return 0;
@@ -6850,7 +6850,6 @@ static int status_natural_heal(DBKey key,void * data,va_list app)
 	if (flag&(RGN_HP|RGN_SP))
 	{
 		struct view_data *vd = status_get_viewdata(bl);
-		bonus = 0;
 		if(vd && vd->dead_sit)
 			bonus++;
 		if(map_getcell(bl->m,bl->x,bl->y,CELL_CHKREGEN))
-- 
cgit v1.2.3-70-g09d2