diff options
| author | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-07-28 13:33:51 +0000 |
|---|---|---|
| committer | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-07-28 13:33:51 +0000 |
| commit | 71140a6d9bb8b15fdee82745b559db0ca6a0052d (patch) | |
| tree | 0337ec2f6a388fdfb9862e7823f67446206629ee /src/map/skill.c | |
| parent | 16cb5fef019d99367ef818e7c1d52a8c2deb8162 (diff) | |
| download | hercules-71140a6d9bb8b15fdee82745b559db0ca6a0052d.tar.gz hercules-71140a6d9bb8b15fdee82745b559db0ca6a0052d.tar.bz2 hercules-71140a6d9bb8b15fdee82745b559db0ca6a0052d.tar.xz hercules-71140a6d9bb8b15fdee82745b559db0ca6a0052d.zip | |
- Some cleaning of battle_drain, Evil Druid card should work now.
- Made status_damage allow damaging of objects not on a map, this should fix pet-catching making the mob never respawn again.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@7946 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/skill.c')
| -rw-r--r-- | src/map/skill.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/map/skill.c b/src/map/skill.c index 08c8469a9..683a38e7e 100644 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -2087,9 +2087,9 @@ int skill_attack (int attack_type, struct block_list* src, struct block_list *ds if(sd && dmg.flag&BF_WEAPON && src != bl && src == dsrc && damage > 0) { if (battle_config.left_cardfix_to_right) - battle_drain(sd, tsd, dmg.damage, dmg.damage, tstatus->race, tstatus->mode&MD_BOSS); + battle_drain(sd, bl, dmg.damage, dmg.damage, tstatus->race, tstatus->mode&MD_BOSS); else - battle_drain(sd, tsd, dmg.damage, dmg.damage2, tstatus->race, tstatus->mode&MD_BOSS); + battle_drain(sd, bl, dmg.damage, dmg.damage2, tstatus->race, tstatus->mode&MD_BOSS); } if (rdamage>0) { @@ -3711,8 +3711,6 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, in if (skill_break_equip(bl, EQP_WEAPON, 10000, BCT_PARTY) && sd && sd != dstsd) clif_displaymessage(sd->fd,"You broke target's weapon"); } - //FIXME : Why clif_skill_nodamage 2 times ? - //clif_skill_nodamage(src,bl,skillid,skilllv,i); break; case PR_ASPERSIO: /* アスペルシオ */ |