diff options
| -rw-r--r-- | Changelog-Trunk.txt | 3 | ||||
| -rw-r--r-- | eAthena-7.1.sln | 16 | ||||
| -rw-r--r-- | src/map/mercenary.c | 2 | ||||
| -rw-r--r-- | src/map/mob.c | 2 | ||||
| -rw-r--r-- | src/map/npc.c | 4 |
5 files changed, 7 insertions, 20 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index 6cda912b4..d997c0c43 100644 --- a/Changelog-Trunk.txt +++ b/Changelog-Trunk.txt @@ -3,6 +3,9 @@ Date Added AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO INTO TRUNK.
IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
+2006/06/02
+ * [Fixed]
+ - Yet another compilation warning. [Lance]
2006/06/01
* Updated item_db.sql/mob_db.sql to current. [Skotlex]
* Fixed NPC_SELFDESTRUCTION not showing nor dealing damage. [Skotlex]
diff --git a/eAthena-7.1.sln b/eAthena-7.1.sln index 62f3104a6..b55e7bd67 100644 --- a/eAthena-7.1.sln +++ b/eAthena-7.1.sln @@ -1,12 +1,4 @@ Microsoft Visual Studio Solution File, Format Version 8.00
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "map-server_txt", "vcproj-7.1\map-server_txt.vcproj", "{D356871D-58E1-450B-967A-E1E9646175AF}"
- ProjectSection(ProjectDependencies) = postProject
- EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "login-server_txt", "vcproj-7.1\login-server_txt.vcproj", "{D356871D-58E1-450B-967A-E2E9646175AF}"
- ProjectSection(ProjectDependencies) = postProject
- EndProjectSection
-EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "char-server_txt", "vcproj-7.1\char-server_txt.vcproj", "{D356871D-58E1-450B-967A-E3E9646175AF}"
ProjectSection(ProjectDependencies) = postProject
EndProjectSection
@@ -29,14 +21,6 @@ Global Release = Release
EndGlobalSection
GlobalSection(ProjectConfiguration) = postSolution
- {D356871D-58E1-450B-967A-E1E9646175AF}.Debug.ActiveCfg = Debug|Win32
- {D356871D-58E1-450B-967A-E1E9646175AF}.Debug.Build.0 = Debug|Win32
- {D356871D-58E1-450B-967A-E1E9646175AF}.Release.ActiveCfg = Release|Win32
- {D356871D-58E1-450B-967A-E1E9646175AF}.Release.Build.0 = Release|Win32
- {D356871D-58E1-450B-967A-E2E9646175AF}.Debug.ActiveCfg = Debug|Win32
- {D356871D-58E1-450B-967A-E2E9646175AF}.Debug.Build.0 = Debug|Win32
- {D356871D-58E1-450B-967A-E2E9646175AF}.Release.ActiveCfg = Release|Win32
- {D356871D-58E1-450B-967A-E2E9646175AF}.Release.Build.0 = Release|Win32
{D356871D-58E1-450B-967A-E3E9646175AF}.Debug.ActiveCfg = Debug|Win32
{D356871D-58E1-450B-967A-E3E9646175AF}.Debug.Build.0 = Debug|Win32
{D356871D-58E1-450B-967A-E3E9646175AF}.Release.ActiveCfg = Release|Win32
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初期化
|