From 262e60ab0b9cfc1f942a7b3ef11f7ed3abc7b208 Mon Sep 17 00:00:00 2001 From: gepard1984 Date: Sun, 4 Mar 2012 18:37:29 +0000 Subject: - Guild Castle code cleanup: - removed `MAX_GUILDCASTLE` limit - char-server now caches guild castles in `DBMap` - improved guild castle SQL queries to support non-default values of `MAX_GUARDIANS` - disallowed declaring guild castles on maps that are on other map-servers - map-server now requests data for all guild castles from char-server on initial connect (bugreport:287) - removed ''guildcastleinfo events'' as they were esentially duplicated ''OnAgitInit'' - optimized castle data load packets (bugreport:287) - updated WoE scripts to reflect source changes (scripts no longer need or should request castle or guild data) - updated related docs - Added `db_size` macro. - Replaced manual counting of castles occupied by a guild with `guild_checkcastles()` calls. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15657 54d463be-8e91-2dee-dedb-b68131a5f0ec --- src/map/clif.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'src/map/clif.c') diff --git a/src/map/clif.c b/src/map/clif.c index 51d5b802d..c50dd9ee2 100644 --- a/src/map/clif.c +++ b/src/map/clif.c @@ -7054,7 +7054,7 @@ void clif_guild_masterormember(struct map_session_data *sd) /// 01b6 .L .L .L .L .L .L .L .L .L .L .24B .24B .16B .L (ZC_GUILD_INFO2) void clif_guild_basicinfo(struct map_session_data *sd) { - int fd,i,t; + int fd; struct guild *g; struct guild_castle *gc = NULL; @@ -7080,13 +7080,7 @@ void clif_guild_basicinfo(struct map_session_data *sd) memcpy(WFIFOP(fd,46),g->name, NAME_LENGTH); memcpy(WFIFOP(fd,70),g->master, NAME_LENGTH); - for(i = 0, t = 0; i < MAX_GUILDCASTLE; i++) - { - gc = guild_castle_search(i); - if(gc && g->guild_id == gc->guild_id) - t++; - } - safestrncpy((char*)WFIFOP(fd,94),msg_txt(300+t),16); // "'N' castles" + safestrncpy((char*)WFIFOP(fd,94),msg_txt(300+guild_checkcastles(g)),16); // "'N' castles" WFIFOL(fd,110) = 0; // zeny WFIFOSET(fd,packet_len(0x1b6)); -- cgit v1.2.3-70-g09d2