- Fixed npc_check_areanpc, Wand of Hermod works now.

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

Changelog-Trunk.txt

@@ -4,6 +4,7 @@ AS OF SVN REV. 5091, WE ARE NOW USING TRUNK.  ALL UNTESTED BUGFIXES/FEATURES GO
 IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
 
 2007/02/12
+	* Fixed Wand of Hermod
 	* Corrected Spider Web casting around caster instead of target's position.
 	* Corrected a possible crash during login due to checking for the incorrect
 	  variable (lets pc_calc_status be invoked when it shouldn't)

src/map/npc.c

@@ -1056,8 +1056,8 @@ int npc_check_areanpc(int flag,int m,int x,int y,int range)
 		default:
 			continue;
 		}
-		if (x0 >= map[m].npc[i]->bl.x-xs/2 && x1 < map[m].npc[i]->bl.x-xs/2+xs &&
-		   y0 >= map[m].npc[i]->bl.y-ys/2 && y1 < map[m].npc[i]->bl.y-ys/2+ys)
+		if (x1 >= map[m].npc[i]->bl.x-xs/2 && x0 < map[m].npc[i]->bl.x-xs/2+xs &&
+			y1 >= map[m].npc[i]->bl.y-ys/2 && y0 < map[m].npc[i]->bl.y-ys/2+ys)
 			break;
 	}
 	if (i==map[m].npc_num)

src/map/status.c

@@ -2420,6 +2420,7 @@ int status_calc_homunculus(struct homun_data *hd, int first)
 	status->adelay = status->amotion; //It seems adelay = amotion for Homunculus.
 
 	status_calc_misc(&hd->bl, status, hom->level);
+	status_cpy(&hd->battle_status, status);
 	status_calc_bl(&hd->bl, SCB_ALL); //Status related changes.
 
 	if (memcmp(&b_status, status, sizeof(struct status_data)))