Skip to content

Commit de4c2e4

Browse files
authoredAug 19, 2017
ServerMap saving: cleanups (#6274)
* 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
1 parent b82884a commit de4c2e4

File tree

5 files changed

+23
-470
lines changed

5 files changed

+23
-470
lines changed
 

‎src/clientmap.cpp

+4-10
Original file line numberDiff line numberDiff line change
@@ -64,20 +64,14 @@ MapSector * ClientMap::emergeSector(v2s16 p2d)
6464
{
6565
DSTACK(FUNCTION_NAME);
6666
// Check that it doesn't exist already
67-
try{
67+
try {
6868
return getSectorNoGenerate(p2d);
69-
}
70-
catch(InvalidPositionException &e)
71-
{
69+
} catch(InvalidPositionException &e) {
7270
}
7371

7472
// Create a sector
75-
ClientMapSector *sector = new ClientMapSector(this, p2d, m_gamedef);
76-
77-
{
78-
//MutexAutoLock lock(m_sector_mutex); // Bulk comment-out
79-
m_sectors[p2d] = sector;
80-
}
73+
MapSector *sector = new MapSector(this, p2d, m_gamedef);
74+
m_sectors[p2d] = sector;
8175

8276
return sector;
8377
}

0 commit comments

Comments
 (0)
Please sign in to comment.