use unordered containers where possible (patch 4 on X) - minetest.git

diff options

author	Loic Blot <loic.blot@unix-experience.fr>	2016-10-06 19:20:12 +0200
committer	sfan5 <sfan5@live.de>	2016-10-06 22:37:26 +0200
commit	155288ee981c70f505526347cb2bcda4df1c8e6b (patch)
tree	582095bc50cb60d3dedb9f6a08e908324a3da365 /src/terminal_chat_console.h
parent	b66a5d2f8842cc84ae44257dc0ead255e5b0538f (diff)
download	minetest-155288ee981c70f505526347cb2bcda4df1c8e6b.tar.gz minetest-155288ee981c70f505526347cb2bcda4df1c8e6b.tar.bz2 minetest-155288ee981c70f505526347cb2bcda4df1c8e6b.zip

use unordered containers where possible (patch 4 on X)

Also remove some unused parameters/functions

Diffstat (limited to 'src/terminal_chat_console.h')

0 files changed, 0 insertions, 0 deletions

/* Minetest-c55 Copyright (C) 2010 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 (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. You should have received a copy of the GNU 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. */ /* (c) 2010 Perttu Ahola <celeron55@gmail.com> */ #ifndef MAPSECTOR_HEADER #define MAPSECTOR_HEADER #include <jmutex.h> #include "common_irrlicht.h" #include "mapblock.h" //#include "heightmap.h" #include "exceptions.h" /* This is an Y-wise stack of MapBlocks. */ #define MAPSECTOR_SERVER 0 #define MAPSECTOR_CLIENT 1 class MapSector: public NodeContainer { public: MapSector(NodeContainer *parent, v2s16 pos); virtual ~MapSector(); virtual u16 nodeContainerId() const { return NODECONTAINER_ID_MAPSECTOR; } virtual u32 getId() const = 0; void deleteBlocks(); v2s16 getPos() { return m_pos; } MapBlock * getBlockNoCreateNoEx(s16 y); MapBlock * getBlockNoCreate(s16 y); MapBlock * createBlankBlockNoInsert(s16 y); MapBlock * createBlankBlock(s16 y); //MapBlock * getBlock(s16 y, bool generate=true); void insertBlock(MapBlock *block); // This is used to remove a dummy from the sector while generating it. // Block is only removed from internal container, not deleted. void removeBlock(MapBlock *block); /* This might not be a thread-safe depending on the day. See the implementation. */ void getBlocks(core::list<MapBlock*> &dest); /* If all nodes in area can be accessed, returns true and adds all blocks in area to blocks. If all nodes in area cannot be accessed, returns false. The implementation of this is quite slow if blocks==NULL; it is not accessed at all. */ bool isValidArea(v3s16 p_min_nodes, v3s16 p_max_nodes, core::map<s16, MapBlock*> *blocks) { core::map<s16, MapBlock*> bs; v3s16 p_min = getNodeBlockPos(p_min_nodes); v3s16 p_max = getNodeBlockPos(p_max_nodes); if(p_min.X != 0 || p_min.Z != 0 || p_max.X != 0 || p_max.Z != 0) return false; v3s16 y; for(s16 y=p_min.Y; y<=p_max.Y; y++) { try{ MapBlock *block = getBlockNoCreate(y); if(block->isDummy()) return false; if(blocks!=NULL) bs[y] = block; } catch(InvalidPositionException &e) { return false; } } if(blocks!=NULL) { for(core::map<s16, MapBlock*>::Iterator i=bs.getIterator(); i.atEnd()==false; i++) { MapBlock *block = i.getNode()->getValue(); s16 y = i.getNode()->getKey(); blocks->insert(y, block); } } return true; } void getBlocksInArea(v3s16 p_min_nodes, v3s16 p_max_nodes, core::map<v3s16, MapBlock*> &blocks) { v3s16 p_min = getNodeBlockPos(p_min_nodes); v3s16 p_max = getNodeBlockPos(p_max_nodes); v3s16 y; for(s16 y=p_min.Y; y<=p_max.Y; y++) { try{ MapBlock *block = getBlockNoCreate(y); blocks.insert(block->getPos(), block); } catch(InvalidPositionException &e) { } } } // virtual from NodeContainer bool isValidPosition(v3s16 p) { v3s16 blockpos = getNodeBlockPos(p); if(blockpos.X != 0 || blockpos.Z != 0) return false; MapBlock *blockref; try{ blockref = getBlockNoCreate(blockpos.Y); } catch(InvalidPositionException &e) { return false; } return true; } // virtual from NodeContainer MapNode getNode(v3s16 p) { v3s16 blockpos = getNodeBlockPos(p); if(blockpos.X != 0 || blockpos.Z != 0) throw InvalidPositionException ("MapSector only allows Y"); MapBlock * blockref = getBlockNoCreate(blockpos.Y); v3s16 relpos = p - blockpos*MAP_BLOCKSIZE; return blockref->getNode(relpos); } // virtual from NodeContainer void setNode(v3s16 p, MapNode & n) { v3s16 blockpos = getNodeBlockPos(p); if(blockpos.X != 0 || blockpos.Z != 0) throw InvalidPositionException ("MapSector only allows Y"); MapBlock * blockref = getBlockNoCreate(blockpos.Y); v3s16 relpos = p - blockpos*MAP_BLOCKSIZE; blockref->setNode(relpos, n); } // DEPRECATED? virtual f32 getGroundHeight(v2s16 p, bool generate=false) { return GROUNDHEIGHT_NOTFOUND_SETVALUE; } virtual void setGroundHeight(v2s16 p, f32 y, bool generate=false) { } // When true, sector metadata is changed from the one on disk // (sector metadata = all but blocks) // Basically, this should be changed to true in every setter method bool differs_from_disk; // Counts seconds from last usage. // Sector can be deleted from memory after some time of inactivity.


context:
space:
mode: