summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Changelog-SVN.txt1
-rw-r--r--src/char_sql/int_guild.c5
-rw-r--r--src/map/npc.h2
3 files changed, 6 insertions, 2 deletions
diff --git a/Changelog-SVN.txt b/Changelog-SVN.txt
index 7e5d7258d..c74b55a6b 100644
--- a/Changelog-SVN.txt
+++ b/Changelog-SVN.txt
@@ -1,6 +1,7 @@
Date Added
02/22
+ * Cleaned up some compiler warnings [SVN 1158: MouseJstr]
* Added perl regular expression support.. look at src/map/npc_chat.c
for all the dirt on the new features. To build it, you have
to enable the PCRE_SUPPORT #define and you also have to
diff --git a/src/char_sql/int_guild.c b/src/char_sql/int_guild.c
index ff310f003..201d40d43 100644
--- a/src/char_sql/int_guild.c
+++ b/src/char_sql/int_guild.c
@@ -505,6 +505,7 @@ struct guild * inter_guild_fromsql(int guild_id)
return g;
}
+#if 0
static int _set_guild_castle(void *key, void *data, va_list ap) {
int castle_id = va_arg(ap, int);
int guild_id = va_arg(ap, int);
@@ -516,7 +517,7 @@ static int _set_guild_castle(void *key, void *data, va_list ap) {
g->castle_id = castle_id;
return 0;
}
-
+#endif
// Save guild_castle to sql
int inter_guildcastle_tosql(struct guild_castle *gc){
@@ -1697,4 +1698,4 @@ int inter_guild_mapif_init(int fd)
int inter_guild_leave(int guild_id,int account_id,int char_id)
{
return mapif_parse_GuildLeave(-1,guild_id,account_id,char_id,0,"**サーバー命令**");
-} \ No newline at end of file
+}
diff --git a/src/map/npc.h b/src/map/npc.h
index dbb351fa0..e04587508 100644
--- a/src/map/npc.h
+++ b/src/map/npc.h
@@ -8,7 +8,9 @@
#define WARP_DEBUG_CLASS 722
#define INVISIBLE_CLASS 32767
+#ifdef PCRE_SUPPORT
void npc_chat_finalize(struct npc_data *nd);
+#endif
int npc_chat_sub(struct block_list *bl, va_list ap);
int npc_event_dequeue(struct map_session_data *sd);
int npc_event_timer(int tid,unsigned int tick,int id,int data);