- 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://svn.code.sf.net/p/rathena/svn/trunk@11880 54d463be-8e91-2dee-dedb-b68131a5f0ec

Changelog-Trunk.txt

@@ -3,6 +3,9 @@ Date	Added
 AS OF SVN REV. 5091, WE ARE NOW USING TRUNK.  ALL UNTESTED BUGFIXES/FEATURES GO INTO TRUNK.
 IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
 
+2007/12/10
+	* Added missing range/skill-mask info to reflected damage (fixes autospells
+	  not triggering on it) [Skotlex]
 2007/12/09
 	* Modified npc_parsesrcfile to parse the line as a 'tab-separated values' 
 	  string and added data truncation warnings.

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);
 		}
 	}
 

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) &&

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) {