summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Changelog-Trunk.txt2
-rw-r--r--src/map/intif.h1
-rw-r--r--src/map/skill.c2
3 files changed, 3 insertions, 2 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index 75fb6e33f..7c4fad66c 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -4,7 +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.
2008/08/25
- * Fixed: compiler warning in admin.c [akrus]
+ * Fixed: several compiler warnings [akrus]
2008/08/20
* Rev. 13098 Implemented Brainstorm's and SketchyPhoenix's fixes for Flying side kick. [L0ne_W0lf]
- Skill will now remove KA-type statuses and not remove stalker's link while preserved.
diff --git a/src/map/intif.h b/src/map/intif.h
index 9ebbd6989..4199959fb 100644
--- a/src/map/intif.h
+++ b/src/map/intif.h
@@ -10,6 +10,7 @@ struct guild_member;
struct guild_position;
struct s_pet;
struct s_homunculus;
+struct s_mercenary;
struct mail_message;
struct auction_data;
diff --git a/src/map/skill.c b/src/map/skill.c
index 254cb1427..146b74c6f 100644
--- a/src/map/skill.c
+++ b/src/map/skill.c
@@ -8384,7 +8384,7 @@ int skill_delayfix (struct block_list *bl, int skill_id, int skill_lv)
{
int delaynodex = skill_get_delaynodex(skill_id, skill_lv);
int time = skill_get_delay(skill_id, skill_lv);
- struct map_session_data *sd = BL_CAST(BL_PC, bl);
+ //struct map_session_data *sd = BL_CAST(BL_PC, bl);
struct status_change *sc = status_get_sc(bl);
nullpo_retr(0, bl);