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

Added import support to mapcache

Browse Source
This commit is contained in:
Lemongrass3110 2015-01-06 16:09:12 +01:00
parent b5e30e0eb6
commit 3707bcfa22
1 changed files with 52 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

79
src/map/map.c
View File

@ -3338,25 +3338,43 @@ int map_readallmaps (void)
int i;
FILE* fp=NULL;
int maps_removed = 0;
char *map_cache_buffer = NULL; // Has the uncompressed gat data of all maps, so just one allocation has to be made
// Has the uncompressed gat data of all maps, so just one allocation has to be made
char *map_cache_buffer[2] = {
NULL,
NULL
};
char map_cache_decode_buffer[MAX_MAP_SIZE];
if( enable_grf )
ShowStatus("Loading maps (using GRF files)...\n");
else {
char mapcachefilepath[254];
sprintf(mapcachefilepath,"%s/%s%s",db_path,DBPATH,"map_cache.dat");
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", mapcachefilepath);
exit(EXIT_FAILURE); //No use launching server if maps can't be read.
}
char* mapcachefilepath[] = {
"db/"DBPATH"map_cache.dat",
"db/import/map_cache.dat"
};
// Init mapcache data. [Shinryo]
map_cache_buffer = map_init_mapcache(fp);
if(!map_cache_buffer) {
ShowFatalError("Failed to initialize mapcache data (%s)..\n", mapcachefilepath);
exit(EXIT_FAILURE);
for( i = 0; i < 2; i++ ){
ShowStatus( "Loading maps (using %s as map cache)...\n", mapcachefilepath[i] );
if( ( fp = fopen(mapcachefilepath[i], "rb") ) == NULL ){
if( i == 0 ){
ShowFatalError( "Unable to open map cache file "CL_WHITE"%s"CL_RESET"\n", mapcachefilepath[i] );
exit(EXIT_FAILURE); //No use launching server if maps can't be read.
}else{
ShowWarning( "Unable to open map cache file "CL_WHITE"%s"CL_RESET"\n", mapcachefilepath[i] );
break;
}
}
// Init mapcache data. [Shinryo]
map_cache_buffer[i] = map_init_mapcache(fp);
if( !map_cache_buffer[i] ) {
ShowFatalError( "Failed to initialize mapcache data (%s)..\n", mapcachefilepath );
exit(EXIT_FAILURE);
}
fclose(fp);
}
}
@ -3364,19 +3382,25 @@ int map_readallmaps (void)
size_t size;
// show progress
if(enable_grf)
if( enable_grf ){
ShowStatus("Loading maps [%i/%i]: %s"CL_CLL"\r", i, map_num, map[i].name);
// try to load the map
if( !
(enable_grf?
map_readgat(&map[i])
:map_readfromcache(&map[i], map_cache_buffer, map_cache_decode_buffer))
) {
map_delmapid(i);
maps_removed++;
i--;
continue;
// try to load the map
if( !map_readgat(&map[i]) ){
map_delmapid(i);
maps_removed++;
i--;
continue;
}
}else{
// try to load the map
if( ( map_cache_buffer[1] != NULL && !map_readfromcache( &map[i], map_cache_buffer[1], map_cache_decode_buffer ) ) && // Read from import first, in case of override
!map_readfromcache( &map[i], map_cache_buffer[0], map_cache_decode_buffer ) ){
map_delmapid(i);
maps_removed++;
i--;
continue;
}
}
map[i].index = mapindex_name2id(map[i].name);
@ -3412,10 +3436,11 @@ int map_readallmaps (void)
map_flags_init();
if( !enable_grf ) {
fclose(fp);
// The cache isn't needed anymore, so free it. [Shinryo]
aFree(map_cache_buffer);
if( map_cache_buffer[1] != NULL ){
aFree(map_cache_buffer[1]);
}
aFree(map_cache_buffer[0]);
}
// finished map loading