From add356a92e12b56c87cb335591a87390e4a663f2 Mon Sep 17 00:00:00 2001 From: skotlex Date: Fri, 2 Jun 2006 13:22:58 +0000 Subject: - Uncommented the npc_debug_warps code.. oops. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@6930 54d463be-8e91-2dee-dedb-b68131a5f0ec --- src/map/npc.c | 4 ++-- src/map/status.c | 8 +++----- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/src/map/npc.c b/src/map/npc.c index 870a94390..72b71b8f9 100644 --- a/src/map/npc.c +++ b/src/map/npc.c @@ -2838,7 +2838,7 @@ int do_final_npc(void) return 0; } -/*static void npc_debug_warps_sub(struct npc_data *nd) +static void npc_debug_warps_sub(struct npc_data *nd) { int m; if (nd->bl.type != BL_NPC || nd->bl.subtype != WARP || nd->bl.m < 0) @@ -2869,7 +2869,7 @@ static void npc_debug_warps(void) for (m = 0; m < map_num; m++) for (i = 0; i < map[m].npc_num; i++) npc_debug_warps_sub(map[m].npc[i]); -}*/ +} /*========================================== * npc‰Šú‰» diff --git a/src/map/status.c b/src/map/status.c index f5130d13e..95d001008 100644 --- a/src/map/status.c +++ b/src/map/status.c @@ -1161,11 +1161,9 @@ int status_calc_mob(struct mob_data* md, int first) status->flee2 = 0; //Initial battle status - if (!first) { - status_cpy(&md->status, status); - if (md->sc.count) - status_calc_bl(&md->bl, SCB_ALL); - } else + if (!first) + status_calc_bl(&md->bl, SCB_ALL); + else memcpy(&md->status, status, sizeof(struct status_data)); return 1; } -- cgit v1.2.3-70-g09d2