summaryrefslogtreecommitdiff
path: root/src/map/map.c
diff options
context:
space:
mode:
authorzephyrus <zephyrus@54d463be-8e91-2dee-dedb-b68131a5f0ec>2008-08-24 15:00:26 +0000
committerzephyrus <zephyrus@54d463be-8e91-2dee-dedb-b68131a5f0ec>2008-08-24 15:00:26 +0000
commit6612269d2706ca08d9b174f292671a024724e6a3 (patch)
tree694f379048fa39552cc14963ac40c310c8ce9727 /src/map/map.c
parent8cb6244382cb6e1bb8b2edd13bba6b91f9c67b1f (diff)
downloadhercules-6612269d2706ca08d9b174f292671a024724e6a3.tar.gz
hercules-6612269d2706ca08d9b174f292671a024724e6a3.tar.bz2
hercules-6612269d2706ca08d9b174f292671a024724e6a3.tar.xz
hercules-6612269d2706ca08d9b174f292671a024724e6a3.zip
- Moving all content of Homunculus code to a proper file Homunculus.c/h
- Update of all project files. NOTE: All functions on homunculus.c should be renamed i think, to remove all the merc_*. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13122 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/map.c')
-rw-r--r--src/map/map.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/map/map.c b/src/map/map.c
index d1605a35e..61c827ff0 100644
--- a/src/map/map.c
+++ b/src/map/map.c
@@ -35,6 +35,7 @@
#include "mapreg.h"
#include "guild.h"
#include "pet.h"
+#include "homunculus.h"
#include "mercenary.h"
#include "atcommand.h"
#include "charcommand.h"
@@ -3544,7 +3545,8 @@ int do_init(int argc, char *argv[])
do_init_guild();
do_init_storage();
do_init_pet();
- do_init_merc(); //[orn]
+ do_init_merc();
+ do_init_mercenary();
do_init_npc();
do_init_unit();
#ifndef TXT_ONLY /* mail system [Valaris] */