Mirroristas/rathena
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- Added guild master check before asking to make/delete an alliance/opposition

Browse Source 
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@9474 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
skotlex 2006-12-12 15:49:02 +00:00
parent 129e97d6c9
commit 83e8fa80b9
1 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/map/clif.c
View File

@ -7287,7 +7287,13 @@ int clif_guild_reqalliance(struct map_session_data *sd,int account_id,const char
return 0; return 0;
} }
/*========================================== /*==========================================
* ギルド同盟結果 * Reply to alliance request.
* Flag values are:
* 0: Already allied.
* 1: You rejected the offer.
* 2: You accepted the offer.
* 3: They have too any alliances
* 4: You have too many alliances.
*------------------------------------------ *------------------------------------------
*/ */
int clif_guild_allianceack(struct map_session_data *sd,int flag) int clif_guild_allianceack(struct map_session_data *sd,int flag)
@ -10787,6 +10793,9 @@ void clif_parse_GuildRequestAlliance(int fd, struct map_session_data *sd) {
RFIFOHEAD(fd); RFIFOHEAD(fd);
if(!sd->state.gmaster_flag)
return;
if(map[sd->bl.m].flag.guildlock) if(map[sd->bl.m].flag.guildlock)
{ //Guild locked. { //Guild locked.
clif_displaymessage(fd, msg_txt(228)); clif_displaymessage(fd, msg_txt(228));
@ -10819,6 +10828,10 @@ void clif_parse_GuildReplyAlliance(int fd, struct map_session_data *sd) {
*/ */
void clif_parse_GuildDelAlliance(int fd, struct map_session_data *sd) { void clif_parse_GuildDelAlliance(int fd, struct map_session_data *sd) {
RFIFOHEAD(fd); RFIFOHEAD(fd);
if(!sd->state.gmaster_flag)
return;
if(map[sd->bl.m].flag.guildlock) if(map[sd->bl.m].flag.guildlock)
{ //Guild locked. { //Guild locked.
clif_displaymessage(fd, msg_txt(228)); clif_displaymessage(fd, msg_txt(228));
@ -10836,6 +10849,9 @@ void clif_parse_GuildOpposition(int fd, struct map_session_data *sd) {
struct map_session_data *t_sd; struct map_session_data *t_sd;
RFIFOHEAD(fd); RFIFOHEAD(fd);
if(!sd->state.gmaster_flag)
return;
if(map[sd->bl.m].flag.guildlock) if(map[sd->bl.m].flag.guildlock)
{ //Guild locked. { //Guild locked.
clif_displaymessage(fd, msg_txt(228)); clif_displaymessage(fd, msg_txt(228));