diff options
author | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2007-03-28 17:29:02 +0000 |
---|---|---|
committer | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2007-03-28 17:29:02 +0000 |
commit | e1792fb0a2b7c51c30ec3f54cedcaa012fb009f7 (patch) | |
tree | 270a68526ed8e2afc03684415ed19894c1faa30f /src/map/map.c | |
parent | 21b1ce2948355586285f4fa3f5f1fc979cb03fb5 (diff) | |
download | hercules-e1792fb0a2b7c51c30ec3f54cedcaa012fb009f7.tar.gz hercules-e1792fb0a2b7c51c30ec3f54cedcaa012fb009f7.tar.bz2 hercules-e1792fb0a2b7c51c30ec3f54cedcaa012fb009f7.tar.xz hercules-e1792fb0a2b7c51c30ec3f54cedcaa012fb009f7.zip |
- Added defines script_getnum and script_getstr to further simplify variable reading code.
- Applied mass replacing of text to enforce usage of script_hasdata, script_getnum, script_getstr and data_isstring defines where possible.
- Cleaned up the 'input' command code.
- Minor other cleanups in script.c
- Removed OPTION_SIGHTTRASHER as there's no indication this value exists.
- Corrected OPTION_XMAS since 2007 clients have split it up from OPTION_FLYING (on previous clients both were the same option value)
- Removed GRF_PATH_FILENAME references (it wasn't used anymore)
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@10085 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/map.c')
-rw-r--r-- | src/map/map.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/map/map.c b/src/map/map.c index 1018a1cec..fba8faa88 100644 --- a/src/map/map.c +++ b/src/map/map.c @@ -110,7 +110,6 @@ char *ATCOMMAND_CONF_FILENAME; char *CHARCOMMAND_CONF_FILENAME; char *SCRIPT_CONF_NAME; char *MSG_CONF_NAME; -char *GRF_PATH_FILENAME; // 極力 staticでロ?カルに?める static struct dbt * id_db=NULL; @@ -3222,7 +3221,6 @@ int do_init(int argc, char *argv[]) { CHARCOMMAND_CONF_FILENAME = "conf/charcommand_athena.conf"; SCRIPT_CONF_NAME = "conf/script_athena.conf"; MSG_CONF_NAME = "conf/msg_athena.conf"; - GRF_PATH_FILENAME = "conf/grf-files.txt"; srand(gettick()); @@ -3243,8 +3241,6 @@ int do_init(int argc, char *argv[]) { SCRIPT_CONF_NAME = argv[i+1]; else if (strcmp(argv[i],"--msg_config") == 0 || strcmp(argv[i],"--msg-config") == 0) MSG_CONF_NAME = argv[i+1]; - else if (strcmp(argv[i],"--grf_path_file") == 0 || strcmp(argv[i],"--grf-path-file") == 0) - GRF_PATH_FILENAME = argv[i+1]; #ifndef TXT_ONLY else if (strcmp(argv[i],"--inter_config") == 0 || strcmp(argv[i],"--inter-config") == 0) INTER_CONF_NAME = argv[i+1]; |