diff options
| author | ultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2007-10-10 22:11:43 +0000 |
|---|---|---|
| committer | ultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2007-10-10 22:11:43 +0000 |
| commit | 8f03106eccfbf42b72a86c2834aff994a7a58a2a (patch) | |
| tree | 22701d6652d99abcc7ef3c6da8da52babd3a2f96 /src/map/status.c | |
| parent | a4bb0c3ad6d6ba04cfe3f142da460bcf836e069f (diff) | |
| download | hercules-8f03106eccfbf42b72a86c2834aff994a7a58a2a.tar.gz hercules-8f03106eccfbf42b72a86c2834aff994a7a58a2a.tar.bz2 hercules-8f03106eccfbf42b72a86c2834aff994a7a58a2a.tar.xz hercules-8f03106eccfbf42b72a86c2834aff994a7a58a2a.zip | |
* Partially removed the usage of 'flags' to direct the execution path in skill unit code (some people seem to really like flags >_>)
- wiped out r8478 and its multiple levels of useless flag propagation
- skill_unit_onlimit (expiration) no longer executes in skill_delunit
- added skill_unit_ondelete for proper handling of this event
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@11399 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/status.c')
| -rw-r--r-- | src/map/status.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/map/status.c b/src/map/status.c index 01d591d6c..ef559853d 100644 --- a/src/map/status.c +++ b/src/map/status.c @@ -665,7 +665,7 @@ int status_damage(struct block_list *src,struct block_list *target,int hp, int s sc->data[SC_GRAVITATION].val3 == BCT_SELF) { struct skill_unit_group *sg = (struct skill_unit_group *)sc->data[SC_GRAVITATION].val4; if (sg) { - skill_delunitgroup(target,sg, 0); + skill_delunitgroup(target,sg); sc->data[SC_GRAVITATION].val4 = 0; status_change_end(target, SC_GRAVITATION, -1); } @@ -6269,7 +6269,7 @@ int status_change_end( struct block_list* bl , int type,int tid ) { group = (struct skill_unit_group *)sc->data[type].val2; sc->data[type].val2 = 0; - skill_delunitgroup(bl, group, 0); + skill_delunitgroup(bl, group); } if(sc->data[type].val4 && sc->data[type].val4 != BCT_SELF && (dsd=map_id2sd(sc->data[type].val4))){ dsc = &dsd->sc; @@ -6360,7 +6360,7 @@ int status_change_end( struct block_list* bl , int type,int tid ) if (sc->data[type].val3) { //Clear the group. struct skill_unit_group *group = (struct skill_unit_group *)sc->data[type].val3; sc->data[type].val3 = 0; - skill_delunitgroup(bl, group, 0); + skill_delunitgroup(bl, group); } break; case SC_HERMODE: @@ -6377,7 +6377,7 @@ int status_change_end( struct block_list* bl , int type,int tid ) if (sc->data[type].val4) { //Clear the group. struct skill_unit_group *group = (struct skill_unit_group *)sc->data[type].val4; sc->data[type].val4 = 0; - skill_delunitgroup(bl, group, 0); + skill_delunitgroup(bl, group); } break; case SC_KAAHI: |