diff options
| author | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-08-31 16:40:37 +0000 |
|---|---|---|
| committer | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-08-31 16:40:37 +0000 |
| commit | c23aea66ad78acff3914f7b865eeba3adb159b0d (patch) | |
| tree | f3eafde9cd91e643336bf6d1bff7cbae27872858 /src/map/battle.c | |
| parent | 693613de2eda402fe459809cbe7ea22cbd052218 (diff) | |
| download | hercules-c23aea66ad78acff3914f7b865eeba3adb159b0d.tar.gz hercules-c23aea66ad78acff3914f7b865eeba3adb159b0d.tar.bz2 hercules-c23aea66ad78acff3914f7b865eeba3adb159b0d.tar.xz hercules-c23aea66ad78acff3914f7b865eeba3adb159b0d.zip | |
- Moved the intimacy penalty of HFLI_SBR44 and HVAN_EXPLOSION to skill_counter_additional_effect
- Simplified skillnotok_hom by using an invocation to skillnotok
- Hopefully fixed BD_ADAPTATION
- Homun won't lose any intimacy on death now.
- Homun will be saved together with the master now (as long as the homun is active)
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@8564 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/battle.c')
| -rw-r--r-- | src/map/battle.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/map/battle.c b/src/map/battle.c index fdac13afc..7e724b0d0 100644 --- a/src/map/battle.c +++ b/src/map/battle.c @@ -1204,11 +1204,8 @@ static struct Damage battle_calc_weapon_attack( break; } case HFLI_SBR44: //[orn] - if(src->type == BL_HOM){ - TBL_HOM *hd = (TBL_HOM*)src; - wd.damage = hd->master->homunculus.intimacy ; - hd->master->homunculus.intimacy = 200; - clif_send_homdata(hd->master,0x100,hd->master->homunculus.intimacy/100); + if(src->type == BL_HOM && ((TBL_HOM*)src)->master) { + wd.damage = ((TBL_HOM*)src)->master->homunculus.intimacy ; break; } default: |