From a6325af8d937fbf600362bacde389e6fa7d02719 Mon Sep 17 00:00:00 2001 From: gepard1984 Date: Mon, 5 Mar 2012 00:08:28 +0000 Subject: - Guild Castle code cleanup: - all changes to guild castle data are now handled first by map-server and only sent to char-server for saving - ensured that changes made to guild castle during char-server disconnection time will be resent on reconnect - actually removed definition of `MAX_GUILDCASTLE` (r15657) git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15658 54d463be-8e91-2dee-dedb-b68131a5f0ec --- src/map/intif.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'src/map/intif.c') diff --git a/src/map/intif.c b/src/map/intif.c index 20d686c11..c0d9050c5 100644 --- a/src/map/intif.c +++ b/src/map/intif.c @@ -36,7 +36,7 @@ static const int packet_len_table[]={ 0, 0, 0, 0, 0, 0, 0, 0, -1,11, 0, 0, 0, 0, 0, 0, //0x3810 39,-1,15,15, 14,19, 7,-1, 0, 0, 0, 0, 0, 0, 0, 0, //0x3820 10,-1,15, 0, 79,19, 7,-1, 0,-1,-1,-1, 14,67,186,-1, //0x3830 - -1, 9, 0,14, 0, 0, 0, 0, -1,74,-1,11, 11,-1, 0, 0, //0x3840 + -1, 0, 0,14, 0, 0, 0, 0, -1,74,-1,11, 11,-1, 0, 0, //0x3840 -1,-1, 7, 7, 7,11, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, //0x3850 Auctions [Zephyrus] -1, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, //0x3860 Quests [Kevin] [Inkfish] -1, 3, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, //0x3870 Mercenaries [Zephyrus] @@ -749,7 +749,7 @@ int intif_guild_castle_datasave(int castle_id,int index, int value) WFIFOB(inter_fd,4)=index; WFIFOL(inter_fd,5)=value; WFIFOSET(inter_fd,9); - return 0; + return 1; } //----------------------------------------------------------------- @@ -1209,11 +1209,6 @@ int intif_parse_GuildCastleDataLoad(int fd) { return guild_castledataloadack(RFIFOW(fd,2), (struct guild_castle *)RFIFOP(fd,4)); } -// ギルド城データ変更通知 -int intif_parse_GuildCastleDataSave(int fd) -{ - return guild_castledatasaveack(RFIFOW(fd,2),RFIFOB(fd,4),RFIFOL(fd,5)); -} int intif_parse_GuildMasterChanged(int fd) { @@ -2037,7 +2032,6 @@ int intif_parse(int fd) case 0x383e: intif_parse_GuildNotice(fd); break; case 0x383f: intif_parse_GuildEmblem(fd); break; case 0x3840: intif_parse_GuildCastleDataLoad(fd); break; - case 0x3841: intif_parse_GuildCastleDataSave(fd); break; case 0x3843: intif_parse_GuildMasterChanged(fd); break; //Quest system -- cgit v1.2.3-60-g2f50