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/char/int_guild.c | 326 ++++++++++++++++++++------------------------------- src/char/int_guild.h | 1 - src/char/inter.c | 4 +- 3 files changed, 126 insertions(+), 205 deletions(-) (limited to 'src/char') diff --git a/src/char/int_guild.c b/src/char/int_guild.c index 3b41e375f..912ee8ab1 100644 --- a/src/char/int_guild.c +++ b/src/char/int_guild.c @@ -32,8 +32,7 @@ static const char dataToHex[] = {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9 //Guild cache static DBMap* guild_db_; // int guild_id -> struct guild* - -struct guild_castle castles[MAX_GUILDCASTLE]; +static DBMap *castle_db; static unsigned int guild_exp[100]; @@ -525,92 +524,78 @@ struct guild * inter_guild_fromsql(int guild_id) return g; } +// `guild_castle` (`castle_id`, `guild_id`, `economy`, `defense`, `triggerE`, `triggerD`, `nextTime`, `payTime`, `createTime`, `visibleC`, `visibleG0`, `visibleG1`, `visibleG2`, `visibleG3`, `visibleG4`, `visibleG5`, `visibleG6`, `visibleG7`) int inter_guildcastle_tosql(struct guild_castle *gc) { - // `guild_castle` (`castle_id`, `guild_id`, `economy`, `defense`, `triggerE`, `triggerD`, `nextTime`, `payTime`, `createTime`, `visibleC`, `visibleG0`, `visibleG1`, `visibleG2`, `visibleG3`, `visibleG4`, `visibleG5`, `visibleG6`, `visibleG7`) - - if (gc==NULL) return 0; - #ifdef GUILD_DEBUG -ShowDebug("Save guild_castle (%d)\n", gc->castle_id); - #endif - -// sql_query("DELETE FROM `%s` WHERE `castle_id`='%d'",guild_castle_db, gc->castle_id); - if( SQL_ERROR == Sql_Query(sql_handle, "REPLACE INTO `%s` " - "(`castle_id`, `guild_id`, `economy`, `defense`, `triggerE`, `triggerD`, `nextTime`, `payTime`, `createTime`," - "`visibleC`, `visibleG0`, `visibleG1`, `visibleG2`, `visibleG3`, `visibleG4`, `visibleG5`, `visibleG6`, `visibleG7`)" - "VALUES ('%d','%d','%d','%d','%d','%d','%d','%d','%d','%d','%d','%d','%d','%d','%d','%d','%d','%d')", - guild_castle_db, gc->castle_id, gc->guild_id, gc->economy, gc->defense, gc->triggerE, gc->triggerD, gc->nextTime, gc->payTime, gc->createTime, gc->visibleC, - gc->guardian[0].visible, gc->guardian[1].visible, gc->guardian[2].visible, gc->guardian[3].visible, gc->guardian[4].visible, gc->guardian[5].visible, gc->guardian[6].visible, gc->guardian[7].visible) ) + StringBuf buf; + int i; + + StringBuf_Init(&buf); + StringBuf_Printf(&buf, "REPLACE INTO `%s` SET `castle_id`='%d', `guild_id`='%d', `economy`='%d', `defense`='%d', " + "`triggerE`='%d', `triggerD`='%d', `nextTime`='%d', `payTime`='%d', `createTime`='%d', `visibleC`='%d'", + guild_castle_db, gc->castle_id, gc->guild_id, gc->economy, gc->defense, + gc->triggerE, gc->triggerD, gc->nextTime, gc->payTime, gc->createTime, gc->visibleC); + for (i = 0; i < MAX_GUARDIANS; ++i) + StringBuf_Printf(&buf, ", `visibleG%d`='%d'", i, gc->guardian[i].visible); + + if (SQL_ERROR == Sql_Query(sql_handle, StringBuf_Value(&buf))) Sql_ShowDebug(sql_handle); + else if(save_log) + ShowInfo("Saved guild castle (%d)\n", gc->castle_id); - memcpy(&castles[gc->castle_id],gc,sizeof(struct guild_castle)); + StringBuf_Destroy(&buf); return 0; } -// Read guild_castle from sql -int inter_guildcastle_fromsql(int castle_id,struct guild_castle *gc) +// Read guild_castle from SQL +static struct guild_castle* inter_guildcastle_fromsql(int castle_id) { - static int castles_init=0; - char* data; - - if (gc==NULL) return 0; - if (castle_id==-1) return 0; - - if(!castles_init) - { - int i; - for(i=0;icastle_id = castle_id; + + if (SQL_SUCCESS == Sql_NextRow(sql_handle)) { + Sql_GetData(sql_handle, 1, &data, NULL); gc->guild_id = atoi(data); + Sql_GetData(sql_handle, 2, &data, NULL); gc->economy = atoi(data); + Sql_GetData(sql_handle, 3, &data, NULL); gc->defense = atoi(data); + Sql_GetData(sql_handle, 4, &data, NULL); gc->triggerE = atoi(data); + Sql_GetData(sql_handle, 5, &data, NULL); gc->triggerD = atoi(data); + Sql_GetData(sql_handle, 6, &data, NULL); gc->nextTime = atoi(data); + Sql_GetData(sql_handle, 7, &data, NULL); gc->payTime = atoi(data); + Sql_GetData(sql_handle, 8, &data, NULL); gc->createTime = atoi(data); + Sql_GetData(sql_handle, 9, &data, NULL); gc->visibleC = atoi(data); + for (i = 10; i < 10+MAX_GUARDIANS; i++) { + Sql_GetData(sql_handle, i, &data, NULL); gc->guardian[i-10].visible = atoi(data); + } } - // ARU: This needs to be set even if there are no SQL results - gc->castle_id=castle_id; - if( SQL_SUCCESS != Sql_NextRow(sql_handle) ) - { - Sql_FreeResult(sql_handle); - return 1; //Assume empty castle. - } - - Sql_GetData(sql_handle, 1, &data, NULL); gc->guild_id = atoi(data); - Sql_GetData(sql_handle, 2, &data, NULL); gc->economy = atoi(data); - Sql_GetData(sql_handle, 3, &data, NULL); gc->defense = atoi(data); - Sql_GetData(sql_handle, 4, &data, NULL); gc->triggerE = atoi(data); - Sql_GetData(sql_handle, 5, &data, NULL); gc->triggerD = atoi(data); - Sql_GetData(sql_handle, 6, &data, NULL); gc->nextTime = atoi(data); - Sql_GetData(sql_handle, 7, &data, NULL); gc->payTime = atoi(data); - Sql_GetData(sql_handle, 8, &data, NULL); gc->createTime = atoi(data); - Sql_GetData(sql_handle, 9, &data, NULL); gc->visibleC = atoi(data); - Sql_GetData(sql_handle, 10, &data, NULL); gc->guardian[0].visible = atoi(data); - Sql_GetData(sql_handle, 11, &data, NULL); gc->guardian[1].visible = atoi(data); - Sql_GetData(sql_handle, 12, &data, NULL); gc->guardian[2].visible = atoi(data); - Sql_GetData(sql_handle, 13, &data, NULL); gc->guardian[3].visible = atoi(data); - Sql_GetData(sql_handle, 14, &data, NULL); gc->guardian[4].visible = atoi(data); - Sql_GetData(sql_handle, 15, &data, NULL); gc->guardian[5].visible = atoi(data); - Sql_GetData(sql_handle, 16, &data, NULL); gc->guardian[6].visible = atoi(data); - Sql_GetData(sql_handle, 17, &data, NULL); gc->guardian[7].visible = atoi(data); - Sql_FreeResult(sql_handle); - memcpy(&castles[castle_id],gc,sizeof(struct guild_castle)); - if( save_log ) - ShowInfo("Loaded Castle %d (guild %d)\n", castle_id, gc->guild_id); + idb_put(castle_db, castle_id, gc); - return 1; + if (save_log) + ShowInfo("Loaded guild castle (%d - guild %d)\n", castle_id, gc->guild_id); + + return gc; } @@ -752,6 +737,7 @@ int inter_guild_sql_init(void) { //Initialize the guild cache guild_db_= idb_alloc(DB_OPT_RELEASE_DATA); + castle_db = idb_alloc(DB_OPT_RELEASE_DATA); //Read exp file inter_guild_ReadEXP(); @@ -774,6 +760,7 @@ static int guild_db_final(DBKey key, void *data, va_list ap) void inter_guild_sql_final(void) { guild_db_->destroy(guild_db_, guild_db_final); + db_destroy(castle_db); return; } @@ -1131,76 +1118,34 @@ int mapif_guild_master_changed(struct guild *g, int aid, int cid) return 0; } -int mapif_guild_castle_dataload(int castle_id,int index,int value) -{ - unsigned char buf[9]; - WBUFW(buf, 0)=0x3840; - WBUFW(buf, 2)=castle_id; - WBUFB(buf, 4)=index; - WBUFL(buf, 5)=value; - mapif_sendall(buf,9); - return 0; -} - -int mapif_guild_castle_datasave(int castle_id,int index,int value) +int mapif_guild_castle_dataload(int fd, int sz, int *castle_ids) { - unsigned char buf[9]; - WBUFW(buf, 0)=0x3841; - WBUFW(buf, 2)=castle_id; - WBUFB(buf, 4)=index; - WBUFL(buf, 5)=value; - mapif_sendall(buf,9); - return 0; -} - -int mapif_guild_castle_alldataload(int fd) -{ - struct guild_castle s_gc; - struct guild_castle* gc = &s_gc; + struct guild_castle *gc = NULL; + int num = (sz - 4) / sizeof(int); + int len = 4 + num * sizeof(*gc); int i; - int len; - char* data; - WFIFOHEAD(fd, 4 + MAX_GUILDCASTLE*sizeof(struct guild_castle)); - WFIFOW(fd, 0) = 0x3842; - if( SQL_ERROR == Sql_Query(sql_handle, - "SELECT `castle_id`, `guild_id`, `economy`, `defense`, `triggerE`, `triggerD`, `nextTime`, `payTime`, `createTime`," - " `visibleC`, `visibleG0`, `visibleG1`, `visibleG2`, `visibleG3`, `visibleG4`, `visibleG5`, `visibleG6`, `visibleG7`" - " FROM `%s` ORDER BY `castle_id`", guild_castle_db) ) - Sql_ShowDebug(sql_handle); - for( i = 0, len = 4; i < MAX_GUILDCASTLE && SQL_SUCCESS == Sql_NextRow(sql_handle); ++i ) - { - memset(gc, 0, sizeof(struct guild_castle)); - - Sql_GetData(sql_handle, 0, &data, NULL); gc->castle_id = atoi(data); - Sql_GetData(sql_handle, 1, &data, NULL); gc->guild_id = atoi(data); - Sql_GetData(sql_handle, 2, &data, NULL); gc->economy = atoi(data); - Sql_GetData(sql_handle, 3, &data, NULL); gc->defense = atoi(data); - Sql_GetData(sql_handle, 4, &data, NULL); gc->triggerE = atoi(data); - Sql_GetData(sql_handle, 5, &data, NULL); gc->triggerD = atoi(data); - Sql_GetData(sql_handle, 6, &data, NULL); gc->nextTime = atoi(data); - Sql_GetData(sql_handle, 7, &data, NULL); gc->payTime = atoi(data); - Sql_GetData(sql_handle, 8, &data, NULL); gc->createTime = atoi(data); - Sql_GetData(sql_handle, 9, &data, NULL); gc->visibleC = atoi(data); - Sql_GetData(sql_handle, 10, &data, NULL); gc->guardian[0].visible = atoi(data); - Sql_GetData(sql_handle, 11, &data, NULL); gc->guardian[1].visible = atoi(data); - Sql_GetData(sql_handle, 12, &data, NULL); gc->guardian[2].visible = atoi(data); - Sql_GetData(sql_handle, 13, &data, NULL); gc->guardian[3].visible = atoi(data); - Sql_GetData(sql_handle, 14, &data, NULL); gc->guardian[4].visible = atoi(data); - Sql_GetData(sql_handle, 15, &data, NULL); gc->guardian[5].visible = atoi(data); - Sql_GetData(sql_handle, 16, &data, NULL); gc->guardian[6].visible = atoi(data); - Sql_GetData(sql_handle, 17, &data, NULL); gc->guardian[7].visible = atoi(data); - - memcpy(WFIFOP(fd, len), gc, sizeof(struct guild_castle)); - len += sizeof(struct guild_castle); - } - Sql_FreeResult(sql_handle); + WFIFOHEAD(fd, len); + WFIFOW(fd, 0) = 0x3840; WFIFOW(fd, 2) = len; + for (i = 0; i < num; i++) { + gc = inter_guildcastle_fromsql(*(castle_ids++)); + memcpy(WFIFOP(fd, 4 + i * sizeof(*gc)), gc, sizeof(*gc)); + } WFIFOSET(fd, len); - return 0; } +int mapif_guild_castle_datasave(int fd, int castle_id, int index, int value) +{ + WFIFOHEAD(fd, 9); + WFIFOW(fd, 0) = 0x3841; + WFIFOW(fd, 2) = castle_id; + WFIFOB(fd, 4) = index; + WFIFOL(fd, 5) = value; + WFIFOSET(fd, 9); + return 0; +} //------------------------------------------------------------------- // Packet received from map server @@ -1820,69 +1765,54 @@ int mapif_parse_GuildEmblem(int fd,int len,int guild_id,int dummy,const char *da return mapif_guild_emblem(g); } -int mapif_parse_GuildCastleDataLoad(int fd,int castle_id,int index) +int mapif_parse_GuildCastleDataLoad(int fd, int len, int *castle_ids) { - struct guild_castle gc; - if (!inter_guildcastle_fromsql(castle_id, &gc)) { - return mapif_guild_castle_dataload(castle_id,0,0); - } - switch(index){ - case 1: return mapif_guild_castle_dataload(gc.castle_id,index,gc.guild_id); break; - case 2: return mapif_guild_castle_dataload(gc.castle_id,index,gc.economy); break; - case 3: return mapif_guild_castle_dataload(gc.castle_id,index,gc.defense); break; - case 4: return mapif_guild_castle_dataload(gc.castle_id,index,gc.triggerE); break; - case 5: return mapif_guild_castle_dataload(gc.castle_id,index,gc.triggerD); break; - case 6: return mapif_guild_castle_dataload(gc.castle_id,index,gc.nextTime); break; - case 7: return mapif_guild_castle_dataload(gc.castle_id,index,gc.payTime); break; - case 8: return mapif_guild_castle_dataload(gc.castle_id,index,gc.createTime); break; - case 9: return mapif_guild_castle_dataload(gc.castle_id,index,gc.visibleC); break; - default: - if (index > 9 && index <= 9+MAX_GUARDIANS) - return mapif_guild_castle_dataload(gc.castle_id,index,gc.guardian[index-10].visible); - ShowError("mapif_parse_GuildCastleDataLoad ERROR!! (Not found index=%d)\n", index); - return 0; - } + return mapif_guild_castle_dataload(fd, len, castle_ids); } -int mapif_parse_GuildCastleDataSave(int fd,int castle_id,int index,int value) +int mapif_parse_GuildCastleDataSave(int fd, int castle_id, int index, int value) { - struct guild_castle gc; - if(!inter_guildcastle_fromsql(castle_id, &gc)) - return mapif_guild_castle_datasave(castle_id,index,value); - - switch(index){ - case 1: - if( gc.guild_id!=value ){ - int gid=(value)?value:gc.guild_id; - struct guild *g = (struct guild*)idb_get(guild_db_, gid); - if(log_inter) - inter_log("guild %s (id=%d) %s castle id=%d\n", - (g)?g->name:"??" ,gid, (value)?"occupy":"abandon", castle_id); - } - gc.guild_id = value; - if(gc.guild_id == 0) { - //Delete guardians. - memset(&gc.guardian, 0, sizeof(gc.guardian)); - } - break; - case 2: gc.economy = value; break; - case 3: gc.defense = value; break; - case 4: gc.triggerE = value; break; - case 5: gc.triggerD = value; break; - case 6: gc.nextTime = value; break; - case 7: gc.payTime = value; break; - case 8: gc.createTime = value; break; - case 9: gc.visibleC = value; break; - default: - if (index > 9 && index <= 9+MAX_GUARDIANS) { - gc.guardian[index-10].visible = value; - break; - } - ShowError("mapif_parse_GuildCastleDataSave ERROR!! (Not found index=%d)\n", index); + struct guild_castle *gc = inter_guildcastle_fromsql(castle_id); + + if (gc == NULL) { + ShowError("mapif_parse_GuildCastleDataSave: castle id=%d not found\n", castle_id); + mapif_guild_castle_datasave(fd, castle_id, index, value); return 0; } - inter_guildcastle_tosql(&gc); - mapif_guild_castle_datasave(gc.castle_id,index,value); + + switch (index) { + case 1: + if (gc->guild_id != value) { + int gid = (value) ? value : gc->guild_id; + struct guild *g = idb_get(guild_db_, gid); + if (log_inter) + inter_log("guild %s (id=%d) %s castle id=%d\n", + (g) ? g->name : "??", gid, (value) ? "occupy" : "abandon", castle_id); + } + gc->guild_id = value; + if (gc->guild_id == 0) { + // Delete guardians. + memset(gc->guardian, 0, sizeof(gc->guardian)); + } + break; + case 2: gc->economy = value; break; + case 3: gc->defense = value; break; + case 4: gc->triggerE = value; break; + case 5: gc->triggerD = value; break; + case 6: gc->nextTime = value; break; + case 7: gc->payTime = value; break; + case 8: gc->createTime = value; break; + case 9: gc->visibleC = value; break; + default: + if (index > 9 && index <= 9+MAX_GUARDIANS) { + gc->guardian[index-10].visible = value; + break; + } + ShowError("mapif_parse_GuildCastleDataSave: not found index=%d\n", index); + return 0; + } + inter_guildcastle_tosql(gc); + mapif_guild_castle_datasave(fd, gc->castle_id, index, value); return 0; } @@ -1947,7 +1877,7 @@ int inter_guild_parse_frommap(int fd) case 0x303D: mapif_parse_GuildAlliance(fd,RFIFOL(fd,2),RFIFOL(fd,6),RFIFOL(fd,10),RFIFOL(fd,14),RFIFOB(fd,18)); break; case 0x303E: mapif_parse_GuildNotice(fd,RFIFOL(fd,2),(const char*)RFIFOP(fd,6),(const char*)RFIFOP(fd,66)); break; case 0x303F: mapif_parse_GuildEmblem(fd,RFIFOW(fd,2)-12,RFIFOL(fd,4),RFIFOL(fd,8),(const char*)RFIFOP(fd,12)); break; - case 0x3040: mapif_parse_GuildCastleDataLoad(fd,RFIFOW(fd,2),RFIFOB(fd,4)); break; + case 0x3040: mapif_parse_GuildCastleDataLoad(fd,RFIFOW(fd,2),(int *)RFIFOP(fd,4)); break; case 0x3041: mapif_parse_GuildCastleDataSave(fd,RFIFOW(fd,2),RFIFOB(fd,4),RFIFOL(fd,5)); break; default: @@ -1957,12 +1887,6 @@ int inter_guild_parse_frommap(int fd) return 1; } -// processes a mapserver connection event -int inter_guild_mapif_init(int fd) -{ - return mapif_guild_castle_alldataload(fd); -} - // サーバーから脱退要求（キャラ削除用） int inter_guild_leave(int guild_id, int account_id, int char_id) { diff --git a/src/char/int_guild.h b/src/char/int_guild.h index 4577357f3..be1d16ab6 100644 --- a/src/char/int_guild.h +++ b/src/char/int_guild.h @@ -24,7 +24,6 @@ struct guild_castle; int inter_guild_parse_frommap(int fd); int inter_guild_sql_init(void); void inter_guild_sql_final(void); -int inter_guild_mapif_init(int fd); int inter_guild_leave(int guild_id,int account_id,int char_id); int mapif_parse_BreakGuild(int fd,int guild_id); int inter_guild_broken(int guild_id); diff --git a/src/char/inter.c b/src/char/inter.c index 75f6533fe..dbff1993f 100644 --- a/src/char/inter.c +++ b/src/char/inter.c @@ -47,7 +47,7 @@ int inter_recv_packet_length[] = { 6,-1, 0, 0, 0, 0, 0, 0, 10,-1, 0, 0, 0, 0, 0, 0, // 3010- -1,10,-1,14, 14,19, 6,-1, 14,14, 0, 0, 0, 0, 0, 0, // 3020- Party -1, 6,-1,-1, 55,19, 6,-1, 14,-1,-1,-1, 18,19,186,-1, // 3030- - 5, 9, 0, 0, 0, 0, 0, 0, 7, 6,10,10, 10,-1, 0, 0, // 3040- + -1, 9, 0, 0, 0, 0, 0, 0, 7, 6,10,10, 10,-1, 0, 0, // 3040- -1,-1,10,10, 0,-1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 3050- Auction System [Zephyrus] 6,-1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 3060- Quest system [Kevin] [Inkfish] -1,10, 6,-1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 3070- Mercenary packets [Zephyrus] @@ -315,8 +315,6 @@ void inter_final(void) int inter_mapif_init(int fd) { - inter_guild_mapif_init(fd); - return 0; } -- cgit v1.2.3-70-g09d2