diff options
| author | ultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2008-01-30 16:25:47 +0000 |
|---|---|---|
| committer | ultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2008-01-30 16:25:47 +0000 |
| commit | 49f192f82cc0026f73bd5b0d1e924cc3ab9ec04c (patch) | |
| tree | ee27a87642fa850cb6a807790a89af1eed001834 | |
| parent | e34596082e7f202f224218de135d5f26fb3070a5 (diff) | |
| download | hercules-49f192f82cc0026f73bd5b0d1e924cc3ab9ec04c.tar.gz hercules-49f192f82cc0026f73bd5b0d1e924cc3ab9ec04c.tar.bz2 hercules-49f192f82cc0026f73bd5b0d1e924cc3ab9ec04c.tar.xz hercules-49f192f82cc0026f73bd5b0d1e924cc3ab9ec04c.zip | |
Added back the GRF_PATH_FILENAME variable and commandline parameter.
Removed confusing /tool/mapcache/ configuration directory, changed code to use /conf for this purpose.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@12154 54d463be-8e91-2dee-dedb-b68131a5f0ec
| -rw-r--r-- | src/map/map.c | 6 | ||||
| -rw-r--r-- | src/map/map.h | 1 | ||||
| -rw-r--r-- | src/tool/mapcache.c | 2 | ||||
| -rw-r--r-- | tools/mapcache/grf_files.txt | 15 |
4 files changed, 7 insertions, 17 deletions
diff --git a/src/map/map.c b/src/map/map.c index cce232fd2..448648f28 100644 --- a/src/map/map.c +++ b/src/map/map.c @@ -93,6 +93,7 @@ char *ATCOMMAND_CONF_FILENAME; char *CHARCOMMAND_CONF_FILENAME; char *SCRIPT_CONF_NAME; char *MSG_CONF_NAME; +char *GRF_PATH_FILENAME; // 極力 staticでロ?カルに?める static DBMap* id_db=NULL; // int id -> struct block_list* @@ -3156,6 +3157,7 @@ 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()); @@ -3176,6 +3178,8 @@ 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]; @@ -3230,7 +3234,7 @@ int do_init(int argc, char *argv[]) mapindex_init(); if(enable_grf) - grfio_init("conf/grf-files.txt"); //[blackhole89] - restore + grfio_init(GRF_PATH_FILENAME); map_readallmaps(); diff --git a/src/map/map.h b/src/map/map.h index fc67a5387..436fbca33 100644 --- a/src/map/map.h +++ b/src/map/map.h @@ -1347,6 +1347,7 @@ extern char *ATCOMMAND_CONF_FILENAME; extern char *CHARCOMMAND_CONF_FILENAME; extern char *SCRIPT_CONF_NAME; extern char *MSG_CONF_NAME; +extern char *GRF_PATH_FILENAME; extern char *map_server_dns; diff --git a/src/tool/mapcache.c b/src/tool/mapcache.c index c74484339..b696c6ee9 100644 --- a/src/tool/mapcache.c +++ b/src/tool/mapcache.c @@ -15,7 +15,7 @@ #define MAP_NAME_LENGTH_EXT 16 #define NO_WATER 1000000 -char grf_list_file[256] = "tools/mapcache/grf_files.txt"; +char grf_list_file[256] = "conf/grf-files.txt"; char map_list_file[256] = "db/map_index.txt"; char map_cache_file[256] = "db/map_cache.dat"; int rebuild = 0; diff --git a/tools/mapcache/grf_files.txt b/tools/mapcache/grf_files.txt deleted file mode 100644 index 21a3145bc..000000000 --- a/tools/mapcache/grf_files.txt +++ /dev/null @@ -1,15 +0,0 @@ -//----------------------------------------- -// GRF List -// Add as many entries as you wish -//----------------------------------------- - -//grf: C:\Program Files\Gravity\RO\data.grf -grf: C:\Program Files\Gravity\RO\sdata.grf - -//----------------------------------------- -// Data Directory -// Path must include trailing backslash -// Only one entry supported! -//----------------------------------------- - -//data_dir: C:\Program Files\Gravity\RO\ |