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/mapsector.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/mapsector.cpp')
-rw-r--r-- | src/mapsector.cpp | 103 |
1 files changed, 0 insertions, 103 deletions
diff --git a/src/mapsector.cpp b/src/mapsector.cpp index c6832a012..3eefa5410 100644 --- a/src/mapsector.cpp +++ b/src/mapsector.cpp @@ -128,106 +128,3 @@ void MapSector::getBlocks(MapBlockVect &dest) dest.push_back(block.second); } } - -/* - ServerMapSector -*/ - -ServerMapSector::ServerMapSector(Map *parent, v2s16 pos, IGameDef *gamedef): - MapSector(parent, pos, gamedef) -{ -} - -void ServerMapSector::serialize(std::ostream &os, u8 version) -{ - if(!ser_ver_supported(version)) - throw VersionMismatchException("ERROR: MapSector format not supported"); - - /* - [0] u8 serialization version - + heightmap data - */ - - // Server has both of these, no need to support not having them. - //assert(m_objects != NULL); - - // Write version - os.write((char*)&version, 1); - - /* - Add stuff here, if needed - */ - -} - -ServerMapSector* ServerMapSector::deSerialize( - std::istream &is, - Map *parent, - v2s16 p2d, - std::map<v2s16, MapSector*> & sectors, - IGameDef *gamedef - ) -{ - /* - [0] u8 serialization version - + heightmap data - */ - - /* - Read stuff - */ - - // Read version - u8 version = SER_FMT_VER_INVALID; - is.read((char*)&version, 1); - - if(!ser_ver_supported(version)) - throw VersionMismatchException("ERROR: MapSector format not supported"); - - /* - Add necessary reading stuff here - */ - - /* - Get or create sector - */ - - ServerMapSector *sector = NULL; - - std::map<v2s16, MapSector*>::iterator n = sectors.find(p2d); - - if(n != sectors.end()) - { - warningstream<<"deSerializing existent sectors not supported " - "at the moment, because code hasn't been tested." - <<std::endl; - - MapSector *sector = n->second; - assert(sector->getId() == MAPSECTOR_SERVER); - return (ServerMapSector*)sector; - } - - sector = new ServerMapSector(parent, p2d, gamedef); - sectors[p2d] = sector; - - /* - Set stuff in sector - */ - - // Nothing here - - return sector; -} - -#ifndef SERVER -/* - ClientMapSector -*/ - -ClientMapSector::ClientMapSector(Map *parent, v2s16 pos, IGameDef *gamedef): - MapSector(parent, pos, gamedef) -{ -} -#endif // !SERVER - -//END |