diff options
author | Loïc Blot <nerzhul@users.noreply.github.com> | 2017-08-19 11:29:46 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-08-19 11:29:46 +0200 |
commit | de4c2e4250d3071a8de7841a1cb3a63af67c63f3 (patch) | |
tree | aa959d1f450ebf25c7be6b4e088e50e15bf4c9ee /src/clientmap.cpp | |
parent | b82884aa62fc0b00bbaef6c31cde095d9ed6f72f (diff) | |
download | minetest-de4c2e4250d3071a8de7841a1cb3a63af67c63f3.tar.gz minetest-de4c2e4250d3071a8de7841a1cb3a63af67c63f3.tar.bz2 minetest-de4c2e4250d3071a8de7841a1cb3a63af67c63f3.zip |
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
Diffstat (limited to 'src/clientmap.cpp')
-rw-r--r-- | src/clientmap.cpp | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/src/clientmap.cpp b/src/clientmap.cpp index 9c4d70f7d..3c9a6c7f4 100644 --- a/src/clientmap.cpp +++ b/src/clientmap.cpp @@ -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; } |