- Fixed some includes in skill.c and npc.c, thanks to 252-rer for finding it out.

- Applied the entry reusage system to the battle delay damage structure.


git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@5166 54d463be-8e91-2dee-dedb-b68131a5f0ec

1 files changed, 2 insertions, 1 deletions

diff --git a/src/map/map.c b/src/map/map.c
index 4e77e9d23..222ada48a 100644
--- a/src/map/map.c
+++ b/src/map/map.c
@@ -3661,6 +3661,7 @@ void do_final(void) {
 	chrif_flush_fifo();

 

 	do_final_atcommand();

+	do_final_battle();

 	do_final_chrif(); // この内部でキャラを全て切断する

 	do_final_npc();

 //	map_removenpc();

@@ -3870,6 +3871,7 @@ int do_init(int argc, char *argv[]) {
 	add_timer_interval(gettick()+1000, map_freeblock_timer, 0, 0, 60*1000);

 

 	do_init_atcommand();

+	do_init_battle();

 	do_init_chrif();

 	do_init_clif();

 	do_init_script();

@@ -3883,7 +3885,6 @@ int do_init(int argc, char *argv[]) {
 	do_init_skill();

 	do_init_pet();

 	do_init_npc();

-

 #ifndef TXT_ONLY /* mail system [Valaris] */

 	if(mail_server_enable)

 		do_init_mail();