From 396001e8663d1fa0f8476f0bad7243317f70ab9d Mon Sep 17 00:00:00 2001
From: Lance <Lance@54d463be-8e91-2dee-dedb-b68131a5f0ec>
Date: Fri, 2 Jun 2006 02:23:56 +0000
Subject: [Fixed] - Yet another compilation warning.

git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@6924 54d463be-8e91-2dee-dedb-b68131a5f0ec
---
 src/map/mercenary.c | 2 +-
 src/map/mob.c       | 2 +-
 src/map/npc.c       | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/map')

diff --git a/src/map/mercenary.c b/src/map/mercenary.c
index 0ceb9cbf5..c62877411 100644
--- a/src/map/mercenary.c
+++ b/src/map/mercenary.c
@@ -153,7 +153,7 @@ void merc_heal(struct homun_data *hd,int hp,int sp)
 #ifndef TXT_ONLY
 void merc_save(struct homun_data *hd)
 {
-	sprintf(tmp_sql, "UPDATE `homunculus` SET `class`='%d',`name`='%s',`level`='%d',`exp`='%d',`hunger`='%d',`hp`='%u',`sp`='%u',`skill1lv`='%d',`skill2lv`='%d',`skill3lv`='%d',`skill4lv`='%d',`skillpts`='%d' WHERE `id` = '%d'", 
+	sprintf(tmp_sql, "UPDATE `homunculus` SET `class`='%d',`name`='%s',`level`='%d',`exp`='%lu',`hunger`='%d',`hp`='%u',`sp`='%u',`skill1lv`='%d',`skill2lv`='%d',`skill3lv`='%d',`skill4lv`='%d',`skillpts`='%d' WHERE `id` = '%d'", 
 		hd->class_,hd->name,hd->level,hd->exp,hd->hunger_rate,
 		hd->battle_status.hp,hd->battle_status.sp,
 		hd->hskill[0].level,hd->hskill[1].level,hd->hskill[2].level,hd->hskill[3].level,
diff --git a/src/map/mob.c b/src/map/mob.c
index 88b06265c..c7096fb86 100644
--- a/src/map/mob.c
+++ b/src/map/mob.c
@@ -1331,7 +1331,7 @@ static int mob_ai_sub_lazy(DBKey key,void * data,va_list app)
 
 	md->last_thinktime=tick;
 
-	if (md->bl.prev==NULL || md->status.hp <= 0)
+	if (md->bl.prev==NULL || md->base_status->hp == 0)
 		return 1;
 
 	// 取り巻きモンスターの処理（呼び戻しされた時）
diff --git a/src/map/npc.c b/src/map/npc.c
index 8f9e95431..9dc5d0357 100644
--- a/src/map/npc.c
+++ b/src/map/npc.c
@@ -2838,7 +2838,7 @@ int do_final_npc(void)
 	return 0;
 }
 
-static void npc_debug_warps_sub(struct npc_data *nd)
+/*static void npc_debug_warps_sub(struct npc_data *nd)
 {
 	int m;
 	if (nd->bl.type != BL_NPC || nd->bl.subtype != WARP || nd->bl.m < 0)
@@ -2869,7 +2869,7 @@ static void npc_debug_warps(void)
 	for (m = 0; m < map_num; m++)
 		for (i = 0; i < map[m].npc_num; i++)
 			npc_debug_warps_sub(map[m].npc[i]);
-}
+}*/
 
 /*==========================================
  * npc初期化
-- 
cgit v1.2.3-70-g09d2