浏览代码

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

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@9474 54d463be-8e91-2dee-dedb-b68131a5f0ec
skotlex 18 年之前
父节点
当前提交
83e8fa80b9
共有 1 个文件被更改,包括 17 次插入1 次删除
  1. 17 1
      src/map/clif.c

+ 17 - 1
src/map/clif.c

@@ -7287,7 +7287,13 @@ int clif_guild_reqalliance(struct map_session_data *sd,int account_id,const char
 	return 0;
 }
 /*==========================================
- * ƒMƒ‹ƒh“¯–¿Œ‹‰Ê
+ * 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));