summaryrefslogtreecommitdiff
path: root/src/map
diff options
context:
space:
mode:
Diffstat (limited to 'src/map')
-rw-r--r--src/map/npc.c4
-rw-r--r--src/map/status.c1
2 files changed, 3 insertions, 2 deletions
diff --git a/src/map/npc.c b/src/map/npc.c
index cffe2a26e..0924e6c1f 100644
--- a/src/map/npc.c
+++ b/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)
diff --git a/src/map/status.c b/src/map/status.c
index e3ad739cf..48afad54a 100644
--- a/src/map/status.c
+++ b/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)))