diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/char/int_guild.c | 8 | ||||
| -rw-r--r-- | src/char_sql/int_guild.c | 8 | ||||
| -rw-r--r-- | src/common/mmo.h | 6 | ||||
| -rw-r--r-- | src/map/clif.c | 6 | ||||
| -rw-r--r-- | src/map/guild.c | 4 | ||||
| -rw-r--r-- | src/map/intif.c | 4 |
6 files changed, 20 insertions, 16 deletions
diff --git a/src/char/int_guild.c b/src/char/int_guild.c index 9a815200f..31cceeff0 100644 --- a/src/char/int_guild.c +++ b/src/char/int_guild.c @@ -865,8 +865,8 @@ int mapif_guild_notice(struct guild *g) WBUFW(buf,0) = 0x383e; WBUFL(buf,2) = g->guild_id; - memcpy(WBUFP(buf,6), g->mes1, 60); - memcpy(WBUFP(buf,66), g->mes2, 120); + memcpy(WBUFP(buf,6), g->mes1, MAX_GUILDMES1); + memcpy(WBUFP(buf,66), g->mes2, MAX_GUILDMES2); mapif_sendall(buf, 186); return 0; @@ -1404,8 +1404,8 @@ int mapif_parse_GuildNotice(int fd, int guild_id, const char *mes1, const char * g = (struct guild*)idb_get(guild_db, guild_id); if (g == NULL) return 0; - memcpy(g->mes1, mes1, 60); - memcpy(g->mes2, mes2, 120); + memcpy(g->mes1, mes1, MAX_GUILDMES1); + memcpy(g->mes2, mes2, MAX_GUILDMES2); return mapif_guild_notice(g); } diff --git a/src/char_sql/int_guild.c b/src/char_sql/int_guild.c index 00331e8e6..0b3d77f07 100644 --- a/src/char_sql/int_guild.c +++ b/src/char_sql/int_guild.c @@ -1131,8 +1131,8 @@ int mapif_guild_notice(struct guild *g) unsigned char buf[256]; WBUFW(buf,0)=0x383e; WBUFL(buf,2)=g->guild_id; - memcpy(WBUFP(buf,6),g->mes1,60); - memcpy(WBUFP(buf,66),g->mes2,120); + memcpy(WBUFP(buf,6),g->mes1,MAX_GUILDMES1); + memcpy(WBUFP(buf,66),g->mes2,MAX_GUILDMES2); mapif_sendall(buf,186); return 0; } @@ -1826,8 +1826,8 @@ int mapif_parse_GuildNotice(int fd,int guild_id,const char *mes1,const char *mes if(g==NULL) return 0; - memcpy(g->mes1,mes1,60); - memcpy(g->mes2,mes2,120); + memcpy(g->mes1,mes1,MAX_GUILDMES1); + memcpy(g->mes2,mes2,MAX_GUILDMES2); g->save_flag |= GS_MES; //Change mes of guild return mapif_guild_notice(g); } diff --git a/src/common/mmo.h b/src/common/mmo.h index 6a78d840c..fd29bc211 100644 --- a/src/common/mmo.h +++ b/src/common/mmo.h @@ -147,6 +147,10 @@ #define END_ACCOUNT_NUM 100000000 #define START_CHAR_NUM 150000 +//Guilds +#define MAX_GUILDMES1 60 +#define MAX_GUILDMES2 120 + //Base Homun skill. #define HM_SKILLBASE 8001 #define MAX_HOMUNSKILL 16 @@ -474,7 +478,7 @@ struct guild { char name[NAME_LENGTH],master[NAME_LENGTH]; struct guild_member member[MAX_GUILD]; struct guild_position position[MAX_GUILDPOSITION]; - char mes1[60],mes2[120]; + char mes1[MAX_GUILDMES1],mes2[MAX_GUILDMES2]; int emblem_len,emblem_id; char emblem_data[2048]; struct guild_alliance alliance[MAX_GUILDALLIANCE]; diff --git a/src/map/clif.c b/src/map/clif.c index d2f4cd786..acc8ffa41 100644 --- a/src/map/clif.c +++ b/src/map/clif.c @@ -7077,8 +7077,8 @@ int clif_guild_notice(struct map_session_data* sd, struct guild* g) WFIFOHEAD(fd,packet_len(0x16f)); WFIFOW(fd,0) = 0x16f; - memcpy(WFIFOP(fd,2), g->mes1, 60); - memcpy(WFIFOP(fd,62), g->mes2, 120); + memcpy(WFIFOP(fd,2), g->mes1, MAX_GUILDMES1); + memcpy(WFIFOP(fd,62), g->mes2, MAX_GUILDMES2); WFIFOSET(fd,packet_len(0x16f)); return 0; } @@ -11169,7 +11169,7 @@ void clif_parse_GuildChangeNotice(int fd, struct map_session_data* sd) // compensate for some client defects when using multilanguage mode if (msg1[0] == '|' && msg1[3] == '|') msg1+= 3; // skip duplicate marker if (msg2[0] == '|' && msg2[3] == '|') msg2+= 3; // skip duplicate marker - if (msg2[0] == '|') msg2[strnlen(msg2, 120)-1] = '\0'; // delete extra space at the end of string + if (msg2[0] == '|') msg2[strnlen(msg2, MAX_GUILDMES2)-1] = '\0'; // delete extra space at the end of string guild_change_notice(sd, guild_id, msg1, msg2); } diff --git a/src/map/guild.c b/src/map/guild.c index cdc978929..f90fc8946 100644 --- a/src/map/guild.c +++ b/src/map/guild.c @@ -1068,8 +1068,8 @@ int guild_notice_changed(int guild_id,const char *mes1,const char *mes2) if(g==NULL) return 0; - memcpy(g->mes1,mes1,60); - memcpy(g->mes2,mes2,120); + memcpy(g->mes1,mes1,MAX_GUILDMES1); + memcpy(g->mes2,mes2,MAX_GUILDMES2); for(i=0;i<g->max_member;i++){ if((sd=g->member[i].sd)!=NULL) diff --git a/src/map/intif.c b/src/map/intif.c index ba5230bab..15d948c59 100644 --- a/src/map/intif.c +++ b/src/map/intif.c @@ -698,8 +698,8 @@ int intif_guild_notice(int guild_id,const char *mes1,const char *mes2) WFIFOHEAD(inter_fd,186); WFIFOW(inter_fd,0)=0x303e; WFIFOL(inter_fd,2)=guild_id; - memcpy(WFIFOP(inter_fd,6),mes1,60); - memcpy(WFIFOP(inter_fd,66),mes2,120); + memcpy(WFIFOP(inter_fd,6),mes1,MAX_GUILDMES1); + memcpy(WFIFOP(inter_fd,66),mes2,MAX_GUILDMES2); WFIFOSET(inter_fd,186); return 0; } |