From bfb15e68b763800587fa57727fc4baaa0e5e2800 Mon Sep 17 00:00:00 2001 From: momacabu Date: Fri, 9 Nov 2012 00:26:36 +0000 Subject: - Removed backup.pl (for TXT servers) and vs9-to-vs8.php (outdated versions); - Merged @killmonster2 with @killmonster tid:73632; - Fixed bugreport:6764, auction code was misplaced; - Follow up to r16753 (bugreport:6523), fixed bugreport:6673, using Gravitational Field with Safety Wall would keep the character immobilized. Blame myself, thankyou Lunar for the fix; - Fixed bugreport:6514, @slaveclone wouldn't be targeted by monster. Thanks to zippy; - Fixed bugreport:6837, some code was duplicated; - Fixed bugreport:6768, removed some leftovers from TXT removal; - Fixed bugreport:6868, Unequipping a weapon with Incantation Samurai card will not kill you if you have less than 999 hp and are on a non-pvp map; - Fixed wrong bit field on ai field in mob_data structure. Credits to Ind. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16881 54d463be-8e91-2dee-dedb-b68131a5f0ec --- src/char/int_elemental.c | 3 --- src/char/int_guild.h | 4 ---- src/char/int_party.h | 2 -- 3 files changed, 9 deletions(-) (limited to 'src/char') diff --git a/src/char/int_elemental.c b/src/char/int_elemental.c index d81e10f84..7c76c4496 100644 --- a/src/char/int_elemental.c +++ b/src/char/int_elemental.c @@ -90,8 +90,6 @@ bool mapif_elemental_delete(int ele_id) { return true; } -#ifndef TXT_SQL_CONVERT - static void mapif_elemental_send(int fd, struct s_elemental *ele, unsigned char flag) { int size = sizeof(struct s_elemental) + 5; @@ -161,4 +159,3 @@ int inter_elemental_parse_frommap(int fd) { } return 1; } -#endif //TXT_SQL_CONVERT diff --git a/src/char/int_guild.h b/src/char/int_guild.h index 202b9b512..47c42dcc5 100644 --- a/src/char/int_guild.h +++ b/src/char/int_guild.h @@ -34,8 +34,4 @@ int inter_guild_charname_changed(int guild_id,int account_id, int char_id, char int inter_guild_CharOnline(int char_id, int guild_id); int inter_guild_CharOffline(int char_id, int guild_id); -//For the TXT->SQL converter. -int inter_guild_tosql(struct guild *g,int flag); -int inter_guildcastle_tosql(struct guild_castle *gc); - #endif /* _INT_GUILD_SQL_H_ */ diff --git a/src/char/int_party.h b/src/char/int_party.h index 703cd5bd5..d8cdcdc6a 100644 --- a/src/char/int_party.h +++ b/src/char/int_party.h @@ -22,7 +22,5 @@ void inter_party_sql_final(void); int inter_party_leave(int party_id,int account_id, int char_id); int inter_party_CharOnline(int char_id, int party_id); int inter_party_CharOffline(int char_id, int party_id); -//Required for the TXT->SQL converter -int inter_party_tosql(struct party *p, int flag, int index); #endif /* _INT_PARTY_SQL_H_ */ -- cgit v1.2.3-70-g09d2