diff options
| author | mc_cameri <mc_cameri@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2004-11-21 05:03:37 +0000 |
|---|---|---|
| committer | mc_cameri <mc_cameri@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2004-11-21 05:03:37 +0000 |
| commit | 8821dcebf6a3f4de268f81bf805702bd3d02b1ca (patch) | |
| tree | 12465bc39643121ea02af8611cdecd62a9922254 /src/map/map.c | |
| parent | a3d94e1fad995503cb7fc6486af7e51f1dab538e (diff) | |
| download | hercules-8821dcebf6a3f4de268f81bf805702bd3d02b1ca.tar.gz hercules-8821dcebf6a3f4de268f81bf805702bd3d02b1ca.tar.bz2 hercules-8821dcebf6a3f4de268f81bf805702bd3d02b1ca.tar.xz hercules-8821dcebf6a3f4de268f81bf805702bd3d02b1ca.zip | |
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/athena@286 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/map.c')
| -rw-r--r-- | src/map/map.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/map/map.c b/src/map/map.c index 98144babe..b47c7786a 100644 --- a/src/map/map.c +++ b/src/map/map.c @@ -33,6 +33,7 @@ #include "guild.h" #include "pet.h" #include "atcommand.h" +#include "charcommand.h" #include "nullpo.h" #include "socket.h" #include "log.h" @@ -2214,6 +2215,7 @@ int do_init(int argc, char *argv[]) { unsigned char *MAP_CONF_NAME = "conf/map_athena.conf"; unsigned char *BATTLE_CONF_FILENAME = "conf/battle_athena.conf"; unsigned char *ATCOMMAND_CONF_FILENAME = "conf/atcommand_athena.conf"; + unsigned char *CHARCOMMAND_CONF_FILENAME = "conf/charcommand_athena.conf"; unsigned char *SCRIPT_CONF_NAME = "conf/script_athena.conf"; unsigned char *MSG_CONF_NAME = "conf/msg_athena.conf"; unsigned char *GRF_PATH_FILENAME = "conf/grf-files.txt"; @@ -2230,6 +2232,8 @@ int do_init(int argc, char *argv[]) { BATTLE_CONF_FILENAME = argv[i+1]; else if (strcmp(argv[i],"--atcommand_config") == 0) ATCOMMAND_CONF_FILENAME = argv[i+1]; + else if (strcmp(argv[i],"--charcommand_config") == 0) + CHARCOMMAND_CONF_FILENAME = argv[i+1]; else if (strcmp(argv[i],"--script_config") == 0) SCRIPT_CONF_NAME = argv[i+1]; else if (strcmp(argv[i],"--msg_config") == 0) @@ -2272,6 +2276,7 @@ int do_init(int argc, char *argv[]) { battle_config_read(BATTLE_CONF_FILENAME); atcommand_config_read(ATCOMMAND_CONF_FILENAME); + charcommand_config_read(CHARCOMMAND_CONF_FILENAME); script_config_read(SCRIPT_CONF_NAME); msg_config_read(MSG_CONF_NAME); #ifndef TXT_ONLY |