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

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

Browse Source 
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14227 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
Paradox924X 2010-01-25 00:38:51 +00:00
parent edc07c36d0
commit 7fb1bdf25c
2 changed files with 4 additions and 0 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/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
src/map/guild.c
View File

@ -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 );