summaryrefslogtreecommitdiff
path: root/src/map/battle.c
diff options
context:
space:
mode:
authorskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-02-21 13:53:36 +0000
committerskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-02-21 13:53:36 +0000
commit6a71c68fd365d0b7e91fe89a2d02296ef465a720 (patch)
tree8f9cc4485e78f23207e3edab3751d8bfe316b66c /src/map/battle.c
parent5834376714bc7f39480eae14b9eb8e15f117d634 (diff)
downloadhercules-6a71c68fd365d0b7e91fe89a2d02296ef465a720.tar.gz
hercules-6a71c68fd365d0b7e91fe89a2d02296ef465a720.tar.bz2
hercules-6a71c68fd365d0b7e91fe89a2d02296ef465a720.tar.xz
hercules-6a71c68fd365d0b7e91fe89a2d02296ef465a720.zip
- Vending is now cancelled on a pc_setpos
- Pressure again ignores Basilica. - Fixed attacker's sc being nulled when the target's sc is empty. - Slaves now do a battle_check_target to check if the new target is an enemy when acquired through sd->skilltarget. - Fixed SC_SKE halving defense2 twice. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@5355 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/battle.c')
-rw-r--r--src/map/battle.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/map/battle.c b/src/map/battle.c
index 78cb1bb15..d7c97e284 100644
--- a/src/map/battle.c
+++ b/src/map/battle.c
@@ -1111,7 +1111,7 @@ static struct Damage battle_calc_weapon_attack(
if (sc && !sc->count)
sc = NULL; //Skip checking as there are no status changes active.
if (tsc && !tsc->count)
- sc = NULL; //Skip checking as there are no status changes active.
+ tsc = NULL; //Skip checking as there are no status changes active.
switch (src->type)
{