summaryrefslogtreecommitdiff
path: root/src/map/unit.c
diff options
context:
space:
mode:
authorskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-09-14 13:46:14 +0000
committerskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-09-14 13:46:14 +0000
commit4be12e4c23f2a73543fa60ff3e0e0f4235a49ff0 (patch)
tree6f8c93989fac5b609363d112e91213387607e478 /src/map/unit.c
parentdca95417da6587e2bc8916cbc749b28430e82b84 (diff)
downloadhercules-4be12e4c23f2a73543fa60ff3e0e0f4235a49ff0.tar.gz
hercules-4be12e4c23f2a73543fa60ff3e0e0f4235a49ff0.tar.bz2
hercules-4be12e4c23f2a73543fa60ff3e0e0f4235a49ff0.tar.xz
hercules-4be12e4c23f2a73543fa60ff3e0e0f4235a49ff0.zip
- Corrected Smokie's pet script to use petskillbonus instead of "bonus"
- Added constant map_flag_gvg2 which tags gvg maps independently of whether woe is on or off. - battle_calc_gvg_damage will be invoked in gvg maps regardless of woe time. - NPC_MENTALBREAKER now zaps matk*lv SP based on observations by Tharis. - md->class_ will be changed on mob-class-change to fix all class-change related bugs. On respawn, the spawn data will be used to revert to the original class. - Improved the pet skillbonus timer for "eternal bonuses" cases where the bonus delay is 0. - Adjusted gvg long damage rate to 80%, magic damage rate to 60% git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@8748 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/unit.c')
-rw-r--r--src/map/unit.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/map/unit.c b/src/map/unit.c
index 396eeca45..2bc274d10 100644
--- a/src/map/unit.c
+++ b/src/map/unit.c
@@ -169,8 +169,7 @@ static int unit_walktoxy_timer(int tid,unsigned int tick,int id,int data)
sd->areanpc_id=0;
if (sd->state.gmaster_flag &&
(battle_config.guild_aura&(agit_flag?2:1)) &&
- (battle_config.guild_aura&
- (map[bl->m].flag.gvg || map[bl->m].flag.gvg_castle?8:4))
+ (battle_config.guild_aura&(map_flag_gvg2(bl->m)?8:4))
)
{ //Guild Aura: Likely needs to be recoded, this method seems inefficient.
struct guild *g = sd->state.gmaster_flag;