summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-06-02 13:22:58 +0000
committerskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-06-02 13:22:58 +0000
commitadd356a92e12b56c87cb335591a87390e4a663f2 (patch)
tree51e2ef2f4e909f416812925b1afd3f6c91a96603
parentf4734c161528c54ec4b34a0702e1c16e25c95a21 (diff)
downloadhercules-add356a92e12b56c87cb335591a87390e4a663f2.tar.gz
hercules-add356a92e12b56c87cb335591a87390e4a663f2.tar.bz2
hercules-add356a92e12b56c87cb335591a87390e4a663f2.tar.xz
hercules-add356a92e12b56c87cb335591a87390e4a663f2.zip
- Uncommented the npc_debug_warps code.. oops.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@6930 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--src/map/npc.c4
-rw-r--r--src/map/status.c8
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;
}