Explorar o código

Cleanup compiler warnings

git-svn-id: https://svn.code.sf.net/p/rathena/svn/branches/stable@1159 54d463be-8e91-2dee-dedb-b68131a5f0ec
amber %!s(int64=20) %!d(string=hai) anos
pai
achega
882e26643d
Modificáronse 3 ficheiros con 6 adicións e 2 borrados
  1. 1 0
      Changelog-SVN.txt
  2. 3 2
      src/char_sql/int_guild.c
  3. 2 0
      src/map/npc.h

+ 1 - 0
Changelog-SVN.txt

@@ -1,6 +1,7 @@
 Date	Added
 Date	Added
 
 
 02/22
 02/22
+	* Cleaned up some compiler warnings [SVN 1158: MouseJstr]
 	* Added perl regular expression support.. look at src/map/npc_chat.c
 	* 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
 	  for all the dirt on the new features.  To build it, you have
 	  to enable the PCRE_SUPPORT #define and you also have to
 	  to enable the PCRE_SUPPORT #define and you also have to

+ 3 - 2
src/char_sql/int_guild.c

@@ -505,6 +505,7 @@ struct guild * inter_guild_fromsql(int guild_id)
 	return g;
 	return g;
 }
 }
 
 
+#if 0
 static int _set_guild_castle(void *key, void *data, va_list ap) {
 static int _set_guild_castle(void *key, void *data, va_list ap) {
     int castle_id = va_arg(ap, int);
     int castle_id = va_arg(ap, int);
     int guild_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;
         g->castle_id = castle_id;
     return 0;
     return 0;
 }
 }
-
+#endif
 
 
 // Save guild_castle to sql
 // Save guild_castle to sql
 int inter_guildcastle_tosql(struct guild_castle *gc){
 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)
 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,"**ƒT�[ƒo�[–½—ß**");
 	return mapif_parse_GuildLeave(-1,guild_id,account_id,char_id,0,"**ƒT�[ƒo�[–½—ß**");
-}
+}

+ 2 - 0
src/map/npc.h

@@ -8,7 +8,9 @@
 #define WARP_DEBUG_CLASS 722
 #define WARP_DEBUG_CLASS 722
 #define INVISIBLE_CLASS 32767
 #define INVISIBLE_CLASS 32767
 
 
+#ifdef PCRE_SUPPORT
 void npc_chat_finalize(struct npc_data *nd);
 void npc_chat_finalize(struct npc_data *nd);
+#endif
 int npc_chat_sub(struct block_list *bl, va_list ap);
 int npc_chat_sub(struct block_list *bl, va_list ap);
 int npc_event_dequeue(struct map_session_data *sd);
 int npc_event_dequeue(struct map_session_data *sd);
 int npc_event_timer(int tid,unsigned int tick,int id,int data);
 int npc_event_timer(int tid,unsigned int tick,int id,int data);