summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2007-12-10 09:25:30 +0000
committerskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2007-12-10 09:25:30 +0000
commit547279bdd6a34d2342e96be57219f31b657f5c47 (patch)
tree3450ed80b08408060ac34fc1162bf9b1d391903b /src
parent16bd7992cfa410cb200fc0357a44c00e8ea92623 (diff)
downloadhercules-547279bdd6a34d2342e96be57219f31b657f5c47.tar.gz
hercules-547279bdd6a34d2342e96be57219f31b657f5c47.tar.bz2
hercules-547279bdd6a34d2342e96be57219f31b657f5c47.tar.xz
hercules-547279bdd6a34d2342e96be57219f31b657f5c47.zip
- Cleared up npc shop id when warping a player.
- Added missing range/skill-mask info to reflected damage (fixes autospells not triggering on it) git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@11880 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src')
-rw-r--r--src/map/battle.c2
-rw-r--r--src/map/skill.c2
-rw-r--r--src/map/unit.c1
3 files changed, 3 insertions, 2 deletions
diff --git a/src/map/battle.c b/src/map/battle.c
index 236a47504..346948cb6 100644
--- a/src/map/battle.c
+++ b/src/map/battle.c
@@ -2881,7 +2881,7 @@ enum damage_lv battle_weapon_attack(struct block_list* src, struct block_list* t
if (rdamage > 0) {
rdelay = clif_damage(src, src, tick, wd.amotion, sstatus->dmotion, rdamage, 1, 4, 0);
//Use Reflect Shield to signal this kind of skill trigger. [Skotlex]
- skill_additional_effect(target,src,CR_REFLECTSHIELD, 1,BF_WEAPON,tick);
+ skill_additional_effect(target,src,CR_REFLECTSHIELD,1,BF_WEAPON|BF_SHORT|BF_NORMAL,tick);
}
}
diff --git a/src/map/skill.c b/src/map/skill.c
index 09c907af7..4e60a39f9 100644
--- a/src/map/skill.c
+++ b/src/map/skill.c
@@ -1672,7 +1672,7 @@ int skill_attack (int attack_type, struct block_list* src, struct block_list *ds
//Use Reflect Shield to signal this kind of skill trigger. [Skotlex]
if (tsd && src != bl)
battle_drain(tsd, src, rdamage, rdamage, sstatus->race, is_boss(src));
- skill_additional_effect(bl,src,CR_REFLECTSHIELD, 1,BF_WEAPON,tick);
+ skill_additional_effect(bl,src,CR_REFLECTSHIELD,1,BF_WEAPON|BF_SHORT|BF_NORMAL,tick);
}
if (!(flag&2) &&
diff --git a/src/map/unit.c b/src/map/unit.c
index cd834524a..a101a5160 100644
--- a/src/map/unit.c
+++ b/src/map/unit.c
@@ -1691,6 +1691,7 @@ int unit_remove_map(struct block_list *bl, int clrtype)
if(sd->menuskill_id)
sd->menuskill_id = sd->menuskill_val = 0;
+ sd->npc_shopid = 0;
pc_delinvincibletimer(sd);
if(sd->pvp_timer!=-1) {