- Removed hom_setting&02 (ignore skill range) as this was fixed by Gravity some time ago.

- Moved pc_delinvincibletimer from unit_removemap to unit_free as the previous method has a logic glitch that could cause an on-place event to trigger after the on-left event. 


git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@12130 54d463be-8e91-2dee-dedb-b68131a5f0ec

conf/Changelog.txt

@@ -1,5 +1,8 @@
 Date	Added
 
+2008/01/22
+	* Removed hom_setting&02 (ignore skill range) as this was fixed by Gravity
+	  some time ago. [Skotlex]
 2008/01/13
 	* Corrected job_knt Mapflags. (bugreport:803) [Samuray22]
 2008/01/10

conf/battle/homunc.conf

@@ -24,7 +24,6 @@
 // Homunculus setting (Note 3)
 // Activates various 'quirks' that makes them behave unlike normal characters.
 // 0x001: Can't be targetted by support skills (except for their master)
-// 0x002: All of their skills get a range equal to view distance + 1
 // 0x004: Mobs will always go after them instead of players until attacked
 // 0x008: Copy their master's speed on spawn/map-change
 // 0x010: They display luk/3+1 instead of their actual critical in the

src/map/battle.c

@@ -3276,10 +3276,6 @@ bool battle_check_range(struct block_list *src,struct block_list *bl,int range)
 	if(src->m != bl->m)	// 違うマップ
 		return false;
 
-
-	if(src->type == BL_HOM && battle_config.hom_setting&0x2)
-		;	//WTF, way to go Aegis and your awesome bugs.
-	else	
 	if (!check_distance_bl(src, bl, range))
 		return false;
 

src/map/unit.c

@@ -1640,7 +1640,7 @@ int unit_remove_map(struct block_list *bl, int clrtype)
 
 	if (bl->type&BL_CHAR) {
 		skill_unit_move(bl,gettick(),4);
-		skill_cleartimerskill(bl);			// タイマースキルクリア
+		skill_cleartimerskill(bl);
 	}
 
 	switch( bl->type )
@@ -1673,7 +1673,6 @@ int unit_remove_map(struct block_list *bl, int clrtype)
 			sd->menuskill_id = sd->menuskill_val = 0;
 
 		sd->npc_shopid = 0;
-		pc_delinvincibletimer(sd);
 
 		if(sd->pvp_timer!=-1) {
 			delete_timer(sd->pvp_timer,pc_calc_pvprank_timer);
@@ -1763,6 +1762,7 @@ int unit_free(struct block_list *bl, int clrtype)
 		if(status_isdead(bl))
 			pc_setrestartvalue(sd,2);
 
+		pc_delinvincibletimer(sd);
 		//Status that are not saved...
 		if(sd->sc.count) {
 			if(sd->sc.data[SC_SPURT])