Skip to content

Commit

Permalink
ServerMap saving: cleanups (#6274)
Browse files Browse the repository at this point in the history
* remove sector meta loading/saving from files which targets dead code (differs_from_disk is always empty)
* this remove empty ServerMapSector and ClientMapSector, remove MapSector childs
  • Loading branch information
nerzhul committed Aug 19, 2017
1 parent b82884a commit de4c2e4
Show file tree
Hide file tree
Showing 5 changed files with 23 additions and 470 deletions.
14 changes: 4 additions & 10 deletions src/clientmap.cpp
Expand Up @@ -64,20 +64,14 @@ MapSector * ClientMap::emergeSector(v2s16 p2d)
{
DSTACK(FUNCTION_NAME);
// Check that it doesn't exist already
try{
try {
return getSectorNoGenerate(p2d);
}
catch(InvalidPositionException &e)
{
} catch(InvalidPositionException &e) {
}

// Create a sector
ClientMapSector *sector = new ClientMapSector(this, p2d, m_gamedef);

{
//MutexAutoLock lock(m_sector_mutex); // Bulk comment-out
m_sectors[p2d] = sector;
}
MapSector *sector = new MapSector(this, p2d, m_gamedef);
m_sectors[p2d] = sector;

return sector;
}
Expand Down

0 comments on commit de4c2e4

Please sign in to comment.