diff options
| author | Haru <haru@dotalux.com> | 2017-07-27 10:39:40 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-27 10:39:40 +0200 |
| commit | b04ce31b952c75d5206fbfec68f2a2712da833c3 (patch) | |
| tree | 9031210c2158e437dec26b26f1135934fe692dbf /src/map/map.c | |
| parent | 45d2d465591d89d927aadf398cdb6166afe9cd9a (diff) | |
| parent | 08121dbcef6b6a70e39ba6c5391d605d1f3e3944 (diff) | |
| download | hercules-b04ce31b952c75d5206fbfec68f2a2712da833c3.tar.gz hercules-b04ce31b952c75d5206fbfec68f2a2712da833c3.tar.bz2 hercules-b04ce31b952c75d5206fbfec68f2a2712da833c3.tar.xz hercules-b04ce31b952c75d5206fbfec68f2a2712da833c3.zip | |
Merge pull request #1811 from 4144/refactor
Refactor status_change_start and fix some issues in other code
Diffstat (limited to 'src/map/map.c')
| -rw-r--r-- | src/map/map.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/map/map.c b/src/map/map.c index 16d5e645d..17156f631 100644 --- a/src/map/map.c +++ b/src/map/map.c @@ -3741,7 +3741,7 @@ int map_readallmaps (void) { ShowStatus("Loading maps (using GRF files)...\n"); else { char mapcachefilepath[256]; - snprintf(mapcachefilepath, 256, "%s/%s%s", map->db_path, DBPATH, "map_cache.dat"); + safesnprintf(mapcachefilepath, 256, "%s/%s%s", map->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); @@ -4396,7 +4396,7 @@ struct map_zone_data *map_merge_zone(struct map_zone_data *main, struct map_zone nullpo_retr(NULL, main); nullpo_retr(NULL, other); - snprintf(newzone, MAP_ZONE_NAME_LENGTH, "%s+%s", main->name, other->name); + safesnprintf(newzone, MAP_ZONE_NAME_LENGTH, "%s+%s", main->name, other->name); if( (zone = strdb_get(map->zone_db, newzone)) ) return zone;/* this zone has already been merged */ |