- Uncommented the npc_debug_warps code.. oops.

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

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�‰Šú‰»

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;
 }