summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-12-12 15:49:02 +0000
committerskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-12-12 15:49:02 +0000
commit17efda0636e47c779c7ffdf38afa1cf55cb217fd (patch)
treea69a1c9b42486ff2a29f67a4eb0cea259de60bd2
parent1427a87a2ad9a4fc947996fff2c7d85d265b67d3 (diff)
downloadhercules-17efda0636e47c779c7ffdf38afa1cf55cb217fd.tar.gz
hercules-17efda0636e47c779c7ffdf38afa1cf55cb217fd.tar.bz2
hercules-17efda0636e47c779c7ffdf38afa1cf55cb217fd.tar.xz
hercules-17efda0636e47c779c7ffdf38afa1cf55cb217fd.zip
- Added guild master check before asking to make/delete an alliance/opposition
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@9474 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--src/map/clif.c18
1 files changed, 17 insertions, 1 deletions
diff --git a/src/map/clif.c b/src/map/clif.c
index 78fcb647b..ac6a8eda0 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -7287,7 +7287,13 @@ int clif_guild_reqalliance(struct map_session_data *sd,int account_id,const char
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)
@@ -10787,6 +10793,9 @@ void clif_parse_GuildRequestAlliance(int fd, struct map_session_data *sd) {
RFIFOHEAD(fd);
+ if(!sd->state.gmaster_flag)
+ return;
+
if(map[sd->bl.m].flag.guildlock)
{ //Guild locked.
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) {
RFIFOHEAD(fd);
+
+ if(!sd->state.gmaster_flag)
+ return;
+
if(map[sd->bl.m].flag.guildlock)
{ //Guild locked.
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;
RFIFOHEAD(fd);
+ if(!sd->state.gmaster_flag)
+ return;
+
if(map[sd->bl.m].flag.guildlock)
{ //Guild locked.
clif_displaymessage(fd, msg_txt(228));