Mirroristas/rathena
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added support to pre-re/re map_cache since some maps differ, this results in map servers' map_cache_file config being dropped.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16867 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
shennetsind 2012-11-07 23:36:00 +00:00
parent a45c1dc469
commit 58bf9e0801
4 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
conf/map_athena.conf
View File

@ -65,9 +65,6 @@ console_msg_log: 0
//Example: "console_silent: 7" Hides information, status and notice messages (1+2+4) //Example: "console_silent: 7" Hides information, status and notice messages (1+2+4)
console_silent: 0 console_silent: 0
//Where should the map data be read from?
map_cache_file: db/map_cache.dat
//Where should all database data be read from? //Where should all database data be read from?
db_path: db db_path: db

0
db/map_cache.dat → db/pre-re/map_cache.dat
View File

BIN
db/re/map_cache.dat Normal file
View File

Binary file not shown.

17
src/map/map.c
View File

@ -148,7 +148,6 @@ struct map_cache_map_info {
int32 len; int32 len;
}; };
char map_cache_file[256]="db/map_cache.dat";
char db_path[256] = "db"; char db_path[256] = "db";
char motd_txt[256] = "conf/motd.txt"; char motd_txt[256] = "conf/motd.txt";
char help_txt[256] = "conf/help.txt"; char help_txt[256] = "conf/help.txt";
@ -3052,19 +3051,19 @@ int map_readallmaps (void)
if( enable_grf ) if( enable_grf )
ShowStatus("Loading maps (using GRF files)...\n"); ShowStatus("Loading maps (using GRF files)...\n");
else else {
{ char mapcachefilepath[254];
ShowStatus("Loading maps (using %s as map cache)...\n", map_cache_file); sprintf(mapcachefilepath,"%s/%s%s",db_path,DBPATH,"map_cache.dat");
if( (fp = fopen(map_cache_file, "rb")) == NULL ) ShowStatus("Loading maps (using %s as map cache)...\n", mapcachefilepath);
{ if( (fp = fopen(mapcachefilepath, "rb")) == NULL ) {
ShowFatalError("Unable to open map cache file "CL_WHITE"%s"CL_RESET"\n", map_cache_file); ShowFatalError("Unable to open map cache file "CL_WHITE"%s"CL_RESET"\n", mapcachefilepath);
exit(EXIT_FAILURE); //No use launching server if maps can't be read. exit(EXIT_FAILURE); //No use launching server if maps can't be read.
} }
// Init mapcache data.. [Shinryo] // Init mapcache data.. [Shinryo]
map_cache_buffer = map_init_mapcache(fp); map_cache_buffer = map_init_mapcache(fp);
if(!map_cache_buffer) { if(!map_cache_buffer) {
ShowFatalError("Failed to initialize mapcache data (%s)..\n", map_cache_file); ShowFatalError("Failed to initialize mapcache data (%s)..\n", mapcachefilepath);
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
} }
@ -3306,8 +3305,6 @@ int map_config_read(char *cfgName)
strcpy(help2_txt, w2); strcpy(help2_txt, w2);
else if (strcmpi(w1, "charhelp_txt") == 0) else if (strcmpi(w1, "charhelp_txt") == 0)
strcpy(charhelp_txt, w2); strcpy(charhelp_txt, w2);
else if(strcmpi(w1,"map_cache_file") == 0)
strncpy(map_cache_file,w2,255);
else if(strcmpi(w1,"db_path") == 0) else if(strcmpi(w1,"db_path") == 0)
strncpy(db_path,w2,255); strncpy(db_path,w2,255);
else if (strcmpi(w1, "console") == 0) { else if (strcmpi(w1, "console") == 0) {