diff options
| author | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-03-09 16:54:36 +0000 |
|---|---|---|
| committer | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-03-09 16:54:36 +0000 |
| commit | 3d6011c46f2f556aa0b9ad41c9e6139ba687e90d (patch) | |
| tree | d9e48e7cf18157e39b541d3232806c58d488642e /src/map/battle.c | |
| parent | 52db25907d75f8d9d9eb914e794f8622c5f540b9 (diff) | |
| download | hercules-3d6011c46f2f556aa0b9ad41c9e6139ba687e90d.tar.gz hercules-3d6011c46f2f556aa0b9ad41c9e6139ba687e90d.tar.bz2 hercules-3d6011c46f2f556aa0b9ad41c9e6139ba687e90d.tar.xz hercules-3d6011c46f2f556aa0b9ad41c9e6139ba687e90d.zip | |
- Moved a bunch of sc_effects that should be cancelled on hit from mob_damage/pc_damage to battle_damage.
- Changed ITEM_NAME_LENGTH to 50.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@5533 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/battle.c')
| -rw-r--r-- | src/map/battle.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/src/map/battle.c b/src/map/battle.c index b75bf0f16..4fc5fb72f 100644 --- a/src/map/battle.c +++ b/src/map/battle.c @@ -260,6 +260,16 @@ int battle_damage(struct block_list *bl,struct block_list *target,int damage, in status_change_end(target,SC_SLEEP,-1);
if (sc->data[SC_WINKCHARM].timer != -1)
status_change_end(target,SC_WINKCHARM,-1);
+ if (sc->data[SC_CONFUSION].timer != -1)
+ status_change_end(target, SC_CONFUSION, -1);
+ if (sc->data[SC_TRICKDEAD].timer != -1)
+ status_change_end(target, SC_TRICKDEAD, -1);
+ if (sc->data[SC_HIDING].timer != -1)
+ status_change_end(target, SC_HIDING, -1);
+ if (sc->data[SC_CLOAKING].timer != -1)
+ status_change_end(target, SC_CLOAKING, -1);
+ if (sc->data[SC_CHASEWALK].timer != -1)
+ status_change_end(target, SC_CHASEWALK, -1);
}
if (target->type == BL_MOB) { // MOB
|