diff options
| author | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-07-18 02:41:10 +0000 |
|---|---|---|
| committer | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-07-18 02:41:10 +0000 |
| commit | 3117bb0eac0745a30b618099899bffd1f58badbd (patch) | |
| tree | 744c31cc53ed6ae1bfa5774a1772c2a16be2769c /src/map/battle.c | |
| parent | 4a2c67dc47ffc7c33eea340ea96e3d0ba57e359e (diff) | |
| download | hercules-3117bb0eac0745a30b618099899bffd1f58badbd.tar.gz hercules-3117bb0eac0745a30b618099899bffd1f58badbd.tar.bz2 hercules-3117bb0eac0745a30b618099899bffd1f58badbd.tar.xz hercules-3117bb0eac0745a30b618099899bffd1f58badbd.zip | |
- Updated mob_db.sql to current mob_db.txt data.
- Some cleaning on chrif.c
- The char-server will allow off-line character saves when said char is tagged for final-save (this is the scenario when the char-map reconnect).
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@7722 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/battle.c')
| -rw-r--r-- | src/map/battle.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/map/battle.c b/src/map/battle.c index e47490ee6..280d4df77 100644 --- a/src/map/battle.c +++ b/src/map/battle.c @@ -761,7 +761,6 @@ static struct Damage battle_calc_weapon_attack( short i; struct map_session_data *sd, *tsd; - struct homun_data *hd; //[orn] struct Damage wd; struct status_change *sc = status_get_sc(src); struct status_change *tsc = status_get_sc(target); @@ -814,7 +813,6 @@ static struct Damage battle_calc_weapon_attack( BL_CAST(BL_PC, src, sd); BL_CAST(BL_PC, target, tsd); - BL_CAST(BL_HOMUNCULUS, src, hd); //[orn] if(sd) { if (sd->skillblown[0].id != 0) @@ -1181,7 +1179,8 @@ static struct Damage battle_calc_weapon_attack( break; } case HFLI_SBR44: //[orn] - if(hd){ + if(src->type == BL_HOMUNCULUS){ + TBL_HOMUNCULUS *hd = (TBL_HOMUNCULUS*)src; wd.damage = hd->master->homunculus.intimacy ; wd.damage2 = hd->master->homunculus.intimacy ; hd->master->homunculus.intimacy = 200; |