Mirroristas/rathena
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed PA_SACRIFICE crash, bugreport:5371, present since r15277

Browse Source 
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@15635 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
shennetsind 2012-02-27 22:29:59 +00:00
parent 3d8bd6c9c1
commit 4f28d3ef20
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/map/battle.c
View File

@ -4019,23 +4019,22 @@ enum damage_lv battle_weapon_attack(struct block_list* src, struct block_list* t
return (damage_lv)skill_attack(BF_WEAPON,src,src,target,MO_TRIPLEATTACK,skillv,tick,0);
}
if (sc)
{
if (sc->data[SC_SACRIFICE])
{
if (sc) {
if (sc->data[SC_SACRIFICE]) {
int skilllv = sc->data[SC_SACRIFICE]->val1;
/**
* We need to calculate the DMG before the hp reduction, because it can kill the source.
* For futher information: bugreport:4950
**/
damage_lv ret_val = (damage_lv)skill_attack(BF_WEAPON,src,src,target,PA_SACRIFICE,skilllv,tick,0);
damage_lv ret_val;
if( --sc->data[SC_SACRIFICE]->val2 <= 0 )
status_change_end(src, SC_SACRIFICE, INVALID_TIMER);
/**
* We need to calculate the DMG before the hp reduction, because it can kill the source.
* For futher information: bugreport:4950
**/
ret_val = (damage_lv)skill_attack(BF_WEAPON,src,src,target,PA_SACRIFICE,skilllv,tick,0);
status_zap(src, sstatus->max_hp*9/100, 0);//Damage to self is always 9%
//FIXME: invalid return type!
return ret_val;
}
if (sc->data[SC_MAGICALATTACK])