/*
-Minetest-c55
-Copyright (C) 2010 celeron55, Perttu Ahola <celeron55@gmail.com>
+Minetest
+Copyright (C) 2013 celeron55, Perttu Ahola <celeron55@gmail.com>
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"
+#ifndef SERVER
#include "client.h"
+#endif
#include "exceptions.h"
+#include "mapblock.h"
-MapSector::MapSector(NodeContainer *parent, v2s16 pos):
- differs_from_disk(true),
+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)
{
- m_mutex.Init();
- assert(m_mutex.IsInitialized());
}
MapSector::~MapSector()
void MapSector::deleteBlocks()
{
- JMutexAutoLock lock(m_mutex);
-
// Clear cache
m_block_cache = NULL;
// Delete all
- core::map<s16, MapBlock*>::Iterator i = m_blocks.getIterator();
- for(; i.atEnd() == false; i++)
+ for(std::map<s16, MapBlock*>::iterator i = m_blocks.begin();
+ i != m_blocks.end(); ++i)
{
- delete i.getNode()->getValue();
+ delete i->second;
}
// Clear container
}
// If block doesn't exist, return NULL
- core::map<s16, MapBlock*>::Node *n = m_blocks.find(y);
- if(n == NULL)
+ std::map<s16, MapBlock*>::iterator n = m_blocks.find(y);
+ if(n == m_blocks.end())
{
block = NULL;
}
// If block exists, return it
else{
- block = n->getValue();
+ block = n->second;
}
// Cache the last result
MapBlock * MapSector::getBlockNoCreateNoEx(s16 y)
{
- JMutexAutoLock lock(m_mutex);
-
return getBlockBuffered(y);
}
-MapBlock * MapSector::getBlockNoCreate(s16 y)
-{
- MapBlock *block = getBlockNoCreateNoEx(y);
-
- if(block == NULL)
- throw InvalidPositionException();
-
- return block;
-}
-
MapBlock * MapSector::createBlankBlockNoInsert(s16 y)
{
- // There should not be a block at this position
- if(getBlockBuffered(y) != NULL)
- throw AlreadyExistsException("Block already exists");
+ assert(getBlockBuffered(y) == NULL);
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)
{
- JMutexAutoLock lock(m_mutex);
-
MapBlock *block = createBlankBlockNoInsert(y);
- m_blocks.insert(y, block);
+ m_blocks[y] = block;
return block;
}
{
s16 block_y = block->getPos().Y;
- {
- JMutexAutoLock lock(m_mutex);
-
- MapBlock *block2 = getBlockBuffered(block_y);
- if(block2 != NULL){
- throw AlreadyExistsException("Block already exists");
- }
-
- v2s16 p2d(block->getPos().X, block->getPos().Z);
- assert(p2d == m_pos);
-
- // Insert into container
- m_blocks.insert(block_y, block);
+ MapBlock *block2 = getBlockBuffered(block_y);
+ if(block2 != NULL){
+ throw AlreadyExistsException("Block already exists");
}
+
+ v2s16 p2d(block->getPos().X, block->getPos().Z);
+ assert(p2d == m_pos);
+
+ // Insert into container
+ m_blocks[block_y] = block;
}
-void MapSector::removeBlock(MapBlock *block)
+void MapSector::deleteBlock(MapBlock *block)
{
s16 block_y = block->getPos().Y;
- JMutexAutoLock lock(m_mutex);
-
// 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<MapBlock*> &dest)
+void MapSector::getBlocks(std::list<MapBlock*> &dest)
{
- JMutexAutoLock lock(m_mutex);
-
- core::list<MapBlock*> ref_list;
-
- core::map<s16, MapBlock*>::Iterator bi;
-
- bi = m_blocks.getIterator();
- for(; bi.atEnd() == false; bi++)
+ for(std::map<s16, MapBlock*>::iterator bi = m_blocks.begin();
+ bi != m_blocks.end(); ++bi)
{
- MapBlock *b = bi.getNode()->getValue();
- dest.push_back(b);
+ dest.push_back(bi->second);
}
}
ServerMapSector
*/
-ServerMapSector::ServerMapSector(NodeContainer *parent, v2s16 pos):
- MapSector(parent, pos)
+ServerMapSector::ServerMapSector(Map *parent, v2s16 pos, IGameDef *gamedef):
+ MapSector(parent, pos, gamedef)
{
}
{
}
-f32 ServerMapSector::getGroundHeight(v2s16 p, bool generate)
-{
- return GROUNDHEIGHT_NOTFOUND_SETVALUE;
-}
-
-void ServerMapSector::setGroundHeight(v2s16 p, f32 y, bool generate)
-{
-}
-
void ServerMapSector::serialize(std::ostream &os, u8 version)
{
if(!ser_ver_supported(version))
ServerMapSector* ServerMapSector::deSerialize(
std::istream &is,
- NodeContainer *parent,
+ Map *parent,
v2s16 p2d,
- core::map<v2s16, MapSector*> & sectors
+ std::map<v2s16, MapSector*> & sectors,
+ IGameDef *gamedef
)
{
/*
ServerMapSector *sector = NULL;
- core::map<v2s16, MapSector*>::Node *n = sectors.find(p2d);
+ std::map<v2s16, MapSector*>::iterator n = sectors.find(p2d);
- if(n != NULL)
+ if(n != sectors.end())
{
dstream<<"WARNING: deSerializing existent sectors not supported "
"at the moment, because code hasn't been tested."
<<std::endl;
- MapSector *sector = n->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;
}
/*
ClientMapSector
*/
-ClientMapSector::ClientMapSector(NodeContainer *parent, v2s16 pos):
- MapSector(parent, pos)
+ClientMapSector::ClientMapSector(Map *parent, v2s16 pos, IGameDef *gamedef):
+ MapSector(parent, pos, gamedef)
{
}
{
}
-void ClientMapSector::deSerialize(std::istream &is)
-{
- /*
- [0] u8 serialization version
- [1] s16 corners[0]
- [3] s16 corners[1]
- [5] s16 corners[2]
- [7] s16 corners[3]
- size = 9
-
- In which corners are in these positions
- v2s16(0,0),
- v2s16(1,0),
- v2s16(1,1),
- v2s16(0,1),
- */
-
- // 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");
-
- u8 buf[2];
-
- // Dummy read corners
- is.read((char*)buf, 2);
- is.read((char*)buf, 2);
- is.read((char*)buf, 2);
- is.read((char*)buf, 2);
-
- /*
- Set stuff in sector
- */
-
- // Nothing here
-
-}
#endif // !SERVER
//END
projects / oweals / minetest.git / blobdiff