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

Fixed it so you can't add opositions during woe se.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14310 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
L0ne_W0lf 2010-05-28 21:57:55 +00:00
parent 96aad4d94d
commit 6d3fc13aea
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Changelog-Trunk.txt
View File

@ -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/05/28
* Rev. 14310 Fixed it so you can't add opositions during woe se. [L0ne_W0lf]
2010/05/20 2010/05/20
* Rev. 14301 Increased gobal_reg_value to 256 from 96. [L0ne_W0lf] * Rev. 14301 Increased gobal_reg_value to 256 from 96. [L0ne_W0lf]
* Upped the max quest db entries allowed to 1500. * Upped the max quest db entries allowed to 1500.

2
src/map/guild.c
View File

@ -1456,7 +1456,7 @@ 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. if(agit_flag || agit2_flag) // Prevent the changing of alliances to oppositions during WoE.
return 0; 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,