summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorL0ne_W0lf <L0ne_W0lf@54d463be-8e91-2dee-dedb-b68131a5f0ec>2010-05-28 21:57:55 +0000
committerL0ne_W0lf <L0ne_W0lf@54d463be-8e91-2dee-dedb-b68131a5f0ec>2010-05-28 21:57:55 +0000
commit6208707840474ae170bea714a93faaba01caeaca (patch)
treeb60ea9b58cbc70bf3658385066a008690c90e0bd
parent68ca34e43076a301030080cf1f27df938a437ed4 (diff)
downloadhercules-6208707840474ae170bea714a93faaba01caeaca.tar.gz
hercules-6208707840474ae170bea714a93faaba01caeaca.tar.bz2
hercules-6208707840474ae170bea714a93faaba01caeaca.tar.xz
hercules-6208707840474ae170bea714a93faaba01caeaca.zip
Fixed it so you can't add opositions during woe se.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14310 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--Changelog-Trunk.txt2
-rw-r--r--src/map/guild.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index 1f45d299a..d8b2837f4 100644
--- a/Changelog-Trunk.txt
+++ b/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.
IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
+2010/05/28
+ * Rev. 14310 Fixed it so you can't add opositions during woe se. [L0ne_W0lf]
2010/05/20
* Rev. 14301 Increased gobal_reg_value to 256 from 96. [L0ne_W0lf]
* Upped the max quest db entries allowed to 1500.
diff --git a/src/map/guild.c b/src/map/guild.c
index 8cb263a87..b6d1b05ae 100644
--- a/src/map/guild.c
+++ b/src/map/guild.c
@@ -1456,7 +1456,7 @@ int guild_opposition(struct map_session_data *sd,struct map_session_data *tsd)
clif_guild_oppositionack(sd,2);
return 0;
}
- if(agit_flag) // Prevent the changing of alliances to oppositions during WoE.
+ if(agit_flag || agit2_flag) // Prevent the changing of alliances to oppositions during WoE.
return 0;
//Change alliance to opposition.
intif_guild_alliance( sd->status.guild_id,tsd->status.guild_id,