diff options
| author | glighta <glighta@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-11-12 01:54:56 +0000 |
|---|---|---|
| committer | glighta <glighta@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-11-12 01:54:56 +0000 |
| commit | 94898ebfcf8ccdae5b064fa27f843136c19e2a65 (patch) | |
| tree | 144b6104b30e2df0bcaa77b3ef096af206d569f7 /src/map/unit.c | |
| parent | 0f715fc0dbaa5c2327a951d107e971f3d7ebd216 (diff) | |
| download | hercules-94898ebfcf8ccdae5b064fa27f843136c19e2a65.tar.gz hercules-94898ebfcf8ccdae5b064fa27f843136c19e2a65.tar.bz2 hercules-94898ebfcf8ccdae5b064fa27f843136c19e2a65.tar.xz hercules-94898ebfcf8ccdae5b064fa27f843136c19e2a65.zip | |
-Upd mob_count to read a 10 modib list to chk if present or not
-Add UNLIMITED_HUMMING implementation, now increase sp requirement and make cast unbreakable
-Upd Group dance overlaping A and B, previous chk wasn't ending other properly (if fail was skipping other)
-Upd OdinPower effect
-Fix Cursed-Circle, shoudn't be able to cast near Emp,Stones bugreport:6457
-Fix Cursed-Circle wasn't remove when caster was being warped
-Small docs upd
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16918 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/unit.c')
| -rw-r--r-- | src/map/unit.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/map/unit.c b/src/map/unit.c index 7e3990e3a..4eaa4ba30 100644 --- a/src/map/unit.c +++ b/src/map/unit.c @@ -1869,7 +1869,7 @@ int unit_skillcastcancel(struct block_list *bl,int type) return 0; if (sd && (sd->special_state.no_castcancel2 || - (sd->special_state.no_castcancel && !map_flag_gvg(bl->m) && !map[bl->m].flag.battleground))) //fixed flags being read the wrong way around [blackhole89] + ((sd->sc.data[SC_UNLIMITEDHUMMINGVOICE] || sd->special_state.no_castcancel) && !map_flag_gvg(bl->m) && !map[bl->m].flag.battleground))) //fixed flags being read the wrong way around [blackhole89] return 0; } @@ -2024,9 +2024,11 @@ int unit_remove_map_(struct block_list *bl, clr_type clrtype, const char* file, status_change_end(bl, SC_CHANGE, INVALID_TIMER); status_change_end(bl, SC_STOP, INVALID_TIMER); status_change_end(bl, SC_WUGDASH, INVALID_TIMER); + status_change_end(bl, SC_CAMOUFLAGE, INVALID_TIMER); status_change_end(bl, SC__SHADOWFORM, INVALID_TIMER); status_change_end(bl, SC__MANHOLE, INVALID_TIMER); - + status_change_end(bl, SC_VACUUM_EXTREME, INVALID_TIMER); + status_change_end(bl, SC_CURSEDCIRCLE_ATKER, INVALID_TIMER); //callme before warp } if (bl->type&(BL_CHAR|BL_PET)) { |