diff options
| author | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-04-30 06:01:16 +0000 |
|---|---|---|
| committer | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-04-30 06:01:16 +0000 |
| commit | f11d79e00eeeffc1a7be0d75b78f580e396b2e7a (patch) | |
| tree | c849129758118b86221ba09ec6b5832ad46b5354 /src/map/mob.c | |
| parent | cafe5e222686411dbfd080eb1efa1083850e60c2 (diff) | |
| download | hercules-f11d79e00eeeffc1a7be0d75b78f580e396b2e7a.tar.gz hercules-f11d79e00eeeffc1a7be0d75b78f580e396b2e7a.tar.bz2 hercules-f11d79e00eeeffc1a7be0d75b78f580e396b2e7a.tar.xz hercules-f11d79e00eeeffc1a7be0d75b78f580e396b2e7a.zip | |
- Removed attack_type from sd->state structure (it's only use was for soul-drain!)
- Moved the soul-drain code to skill_counter_additionaleffect
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@6392 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/mob.c')
| -rw-r--r-- | src/map/mob.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/src/map/mob.c b/src/map/mob.c index e98917ae4..84f40b514 100644 --- a/src/map/mob.c +++ b/src/map/mob.c @@ -1715,12 +1715,6 @@ int mob_damage(struct block_list *src,struct mob_data *md,int damage,int type) if(sd) {
int sp = 0, hp = 0;
- if (sd->state.attack_type == BF_MAGIC && sd->ud.skilltarget == md->bl.id && (i=pc_checkskill(sd,HW_SOULDRAIN))>0)
- { //Soul Drain should only work on targetted spells [Skotlex]
- if (pc_issit(sd)) pc_setstand(sd); //Character stuck in attacking animation while 'sitting' fix. [Skotlex]
- clif_skill_nodamage(src,&md->bl,HW_SOULDRAIN,i,1);
- sp += (status_get_lv(&md->bl))*(95+15*i)/100;
- }
sp += sd->sp_gain_value;
sp += sd->sp_gain_race[race];
sp += sd->sp_gain_race[mode&MD_BOSS?10:11];
@@ -2035,7 +2029,7 @@ int mob_damage(struct block_list *src,struct mob_data *md,int damage,int type) mob_item_drop(md, dlist, mob_setlootitem(&md->lootitem[i]), 1, 10000);
}
if (dlist->item) //There are drop items.
- add_timer(tick + ((!battle_config.delay_battle_damage || (sd && sd->state.attack_type == BF_MAGIC))?500:0),
+ add_timer(tick + (!battle_config.delay_battle_damage?500:0),
mob_delay_item_drop, (int)dlist, 0);
else //No drops
ers_free(item_drop_list_ers, dlist);
|