Просмотр исходного кода

Prevented the changing of alliances to oppositions during WoE. (bugreport:3923)

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14227 54d463be-8e91-2dee-dedb-b68131a5f0ec
Paradox924X 15 лет назад
Родитель
Сommit
7fb1bdf25c
2 измененных файлов с 4 добавлено и 0 удалено
  1. 2 0
      Changelog-Trunk.txt
  2. 2 0
      src/map/guild.c

+ 2 - 0
Changelog-Trunk.txt

@@ -3,6 +3,8 @@ Date	Added
 AS OF SVN REV. 5091, WE ARE NOW USING TRUNK.  ALL UNTESTED BUGFIXES/FEATURES GO INTO TRUNK.
 AS OF SVN REV. 5091, WE ARE NOW USING TRUNK.  ALL UNTESTED BUGFIXES/FEATURES GO INTO TRUNK.
 IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
 IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
 
 
+2010/01/24
+	* Prevented the changing of alliances to oppositions during WoE. (bugreport:3923) [Paradox924X]
 2010/01/23
 2010/01/23
 	* Prevented pc_skill with a value of 2 for 'flag' from granting a skill level that surpasses MAX_SKILL_LEVEL. (bugreport:4022) [Paradox924X]
 	* Prevented pc_skill with a value of 2 for 'flag' from granting a skill level that surpasses MAX_SKILL_LEVEL. (bugreport:4022) [Paradox924X]
 2010/01/19
 2010/01/19

+ 2 - 0
src/map/guild.c

@@ -1456,6 +1456,8 @@ int guild_opposition(struct map_session_data *sd,struct map_session_data *tsd)
 				clif_guild_oppositionack(sd,2);
 				clif_guild_oppositionack(sd,2);
 				return 0;
 				return 0;
 			}
 			}
+			if(agit_flag) // Prevent the changing of alliances to oppositions during WoE.
+				return 0;
 			//Change alliance to opposition.
 			//Change alliance to opposition.
 			intif_guild_alliance( sd->status.guild_id,tsd->status.guild_id,
 			intif_guild_alliance( sd->status.guild_id,tsd->status.guild_id,
 				sd->status.account_id,tsd->status.account_id,8 );
 				sd->status.account_id,tsd->status.account_id,8 );