diff options
| author | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-08-18 14:26:26 +0000 |
|---|---|---|
| committer | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-08-18 14:26:26 +0000 |
| commit | 424938aa953e6384f59eb593d6f5f377e007a443 (patch) | |
| tree | f6d1c8d1c6697bfada6ebb91ec2a9439e4539ed6 /src/map/unit.c | |
| parent | 67213795d8e2c020d0e7d743e98238b65b35630e (diff) | |
| download | hercules-424938aa953e6384f59eb593d6f5f377e007a443.tar.gz hercules-424938aa953e6384f59eb593d6f5f377e007a443.tar.bz2 hercules-424938aa953e6384f59eb593d6f5f377e007a443.tar.xz hercules-424938aa953e6384f59eb593d6f5f377e007a443.zip | |
- Added guild_aura (skill.conf) setting so you can specify when it works and if it works on the guild-master itself. Defaults to working all the time on everyone except GM.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@8342 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/unit.c')
| -rw-r--r-- | src/map/unit.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/map/unit.c b/src/map/unit.c index 4d6fdc29f..52284d83d 100644 --- a/src/map/unit.c +++ b/src/map/unit.c @@ -173,7 +173,11 @@ static int unit_walktoxy_timer(int tid,unsigned int tick,int id,int data) return 0; } else sd->areanpc_id=0; - if (sd->state.gmaster_flag) + 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)) + ) { //Guild Aura: Likely needs to be recoded, this method seems inefficient. struct guild *g = sd->state.gmaster_flag; int skill, strvit= 0, agidex = 0; |