X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmapsector.cpp;h=ad7cb7b700bffce8738b894a2d1332d51b19371a;hb=ff73c7a5da6ab8ac0bb678ebf25b83e805397029;hp=389714f409bfa572cb3cd0dac1b023376e819824;hpb=cb130d9158dc4e9c456d088d5e214b7d829ccc3a;p=dragonfireclient.git diff --git a/src/mapsector.cpp b/src/mapsector.cpp index 389714f40..ad7cb7b70 100644 --- a/src/mapsector.cpp +++ b/src/mapsector.cpp @@ -1,32 +1,32 @@ /* -Minetest-c55 -Copyright (C) 2010 celeron55, Perttu Ahola +Minetest +Copyright (C) 2013 celeron55, Perttu Ahola This program is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2 of the License, or +it under the terms of the GNU Lesser General Public License as published by +the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. +GNU Lesser General Public License for more details. -You should have received a copy of the GNU General Public License along +You should have received a copy of the GNU Lesser General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ #include "mapsector.h" -#include "jmutexautolock.h" -#include "client.h" #include "exceptions.h" #include "mapblock.h" +#include "serialization.h" -MapSector::MapSector(NodeContainer *parent, v2s16 pos): +MapSector::MapSector(Map *parent, v2s16 pos, IGameDef *gamedef): differs_from_disk(false), m_parent(parent), m_pos(pos), + m_gamedef(gamedef), m_block_cache(NULL) { } @@ -42,10 +42,9 @@ void MapSector::deleteBlocks() m_block_cache = NULL; // Delete all - core::map::Iterator i = m_blocks.getIterator(); - for(; i.atEnd() == false; i++) - { - delete i.getNode()->getValue(); + for (std::unordered_map::iterator i = m_blocks.begin(); + i != m_blocks.end(); ++i) { + delete i->second; } // Clear container @@ -56,25 +55,18 @@ MapBlock * MapSector::getBlockBuffered(s16 y) { MapBlock *block; - if(m_block_cache != NULL && y == m_block_cache_y){ + if (m_block_cache != NULL && y == m_block_cache_y) { return m_block_cache; } - + // If block doesn't exist, return NULL - core::map::Node *n = m_blocks.find(y); - if(n == NULL) - { - block = NULL; - } - // If block exists, return it - else{ - block = n->getValue(); - } - + std::unordered_map::const_iterator n = m_blocks.find(y); + block = (n != m_blocks.end() ? n->second : NULL); + // Cache the last result m_block_cache_y = y; m_block_cache = block; - + return block; } @@ -85,20 +77,20 @@ MapBlock * MapSector::getBlockNoCreateNoEx(s16 y) MapBlock * MapSector::createBlankBlockNoInsert(s16 y) { - assert(getBlockBuffered(y) == NULL); + assert(getBlockBuffered(y) == NULL); // Pre-condition v3s16 blockpos_map(m_pos.X, y, m_pos.Y); - - MapBlock *block = new MapBlock(m_parent, blockpos_map); - + + MapBlock *block = new MapBlock(m_parent, blockpos_map, m_gamedef); + return block; } MapBlock * MapSector::createBlankBlock(s16 y) { MapBlock *block = createBlankBlockNoInsert(y); - - m_blocks.insert(y, block); + + m_blocks[y] = block; return block; } @@ -114,9 +106,9 @@ void MapSector::insertBlock(MapBlock *block) v2s16 p2d(block->getPos().X, block->getPos().Z); assert(p2d == m_pos); - + // Insert into container - m_blocks.insert(block_y, block); + m_blocks[block_y] = block; } void MapSector::deleteBlock(MapBlock *block) @@ -125,25 +117,19 @@ void MapSector::deleteBlock(MapBlock *block) // Clear from cache m_block_cache = NULL; - + // Remove from container - m_blocks.remove(block_y); + m_blocks.erase(block_y); // Delete delete block; } -void MapSector::getBlocks(core::list &dest) +void MapSector::getBlocks(MapBlockVect &dest) { - core::list ref_list; - - core::map::Iterator bi; - - bi = m_blocks.getIterator(); - for(; bi.atEnd() == false; bi++) - { - MapBlock *b = bi.getNode()->getValue(); - dest.push_back(b); + for (std::unordered_map::iterator bi = m_blocks.begin(); + bi != m_blocks.end(); ++bi) { + dest.push_back(bi->second); } } @@ -151,8 +137,8 @@ void MapSector::getBlocks(core::list &dest) ServerMapSector */ -ServerMapSector::ServerMapSector(NodeContainer *parent, v2s16 pos): - MapSector(parent, pos) +ServerMapSector::ServerMapSector(Map *parent, v2s16 pos, IGameDef *gamedef): + MapSector(parent, pos, gamedef) { } @@ -164,18 +150,18 @@ 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 */ @@ -184,9 +170,10 @@ void ServerMapSector::serialize(std::ostream &os, u8 version) ServerMapSector* ServerMapSector::deSerialize( std::istream &is, - NodeContainer *parent, + Map *parent, v2s16 p2d, - core::map & sectors + std::map & sectors, + IGameDef *gamedef ) { /* @@ -197,40 +184,40 @@ ServerMapSector* ServerMapSector::deSerialize( /* 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; - core::map::Node *n = sectors.find(p2d); + std::map::iterator n = sectors.find(p2d); - if(n != NULL) + if(n != sectors.end()) { - dstream<<"WARNING: deSerializing existent sectors not supported " + warningstream<<"deSerializing existent sectors not supported " "at the moment, because code hasn't been tested." <getValue(); + MapSector *sector = n->second; assert(sector->getId() == MAPSECTOR_SERVER); return (ServerMapSector*)sector; } else { - sector = new ServerMapSector(parent, p2d); - sectors.insert(p2d, sector); + sector = new ServerMapSector(parent, p2d, gamedef); + sectors[p2d] = sector; } /* @@ -247,8 +234,8 @@ ServerMapSector* ServerMapSector::deSerialize( ClientMapSector */ -ClientMapSector::ClientMapSector(NodeContainer *parent, v2s16 pos): - MapSector(parent, pos) +ClientMapSector::ClientMapSector(Map *parent, v2s16 pos, IGameDef *gamedef): + MapSector(parent, pos, gamedef) { }