summaryrefslogtreecommitdiff
path: root/src/map/skill.c
diff options
context:
space:
mode:
authoreathenabot <eathenabot@54d463be-8e91-2dee-dedb-b68131a5f0ec>2011-12-23 13:41:11 +0000
committereathenabot <eathenabot@54d463be-8e91-2dee-dedb-b68131a5f0ec>2011-12-23 13:41:11 +0000
commita1054261bf5a6083004b66ffc6cd44271aba1908 (patch)
treee5a6c2df010ca497d01721d3fd0c005b27d3d9d4 /src/map/skill.c
parenta4a01f981ecd7f8bda6cddcd1d7b28ed13345cdd (diff)
downloadhercules-a1054261bf5a6083004b66ffc6cd44271aba1908.tar.gz
hercules-a1054261bf5a6083004b66ffc6cd44271aba1908.tar.bz2
hercules-a1054261bf5a6083004b66ffc6cd44271aba1908.tar.xz
hercules-a1054261bf5a6083004b66ffc6cd44271aba1908.zip
* Merged changes up to eAthena 15038.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15225 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/skill.c')
-rw-r--r--src/map/skill.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/src/map/skill.c b/src/map/skill.c
index 328dcd322..ebb8f170b 100644
--- a/src/map/skill.c
+++ b/src/map/skill.c
@@ -2409,12 +2409,10 @@ static int skill_check_unit_range2 (struct block_list *bl, int x, int y, int ski
int skill_guildaura_sub (struct map_session_data* sd, int id, int strvit, int agidex)
{
- nullpo_ret(sd);
-
- if( id == sd->bl.id && battle_config.guild_aura&16 )
- return 0;
+ if(id == sd->bl.id && battle_config.guild_aura&16)
+ return 0; // Do not affect guild leader
- if( sd->sc.data[SC_GUILDAURA] ) {
+ if (sd->sc.data[SC_GUILDAURA]) {
struct status_change_entry *sce = sd->sc.data[SC_GUILDAURA];
if( sce->val3 != strvit || sce->val4 != agidex ) {
sce->val3 = strvit;