Fix error when `item` isn't provided to core.hud_replace_builtin (#12484) - minetest.git

diff options

author	rubenwardy <rw@rubenwardy.com>	2022-07-02 18:28:11 +0100
committer	GitHub <noreply@github.com>	2022-07-02 18:28:11 +0100
commit	b095dc4f2bf2a1ace010dfae0ead69654b0ca3ac (patch)
tree	67b2870a0c6f52eab1c7d9dd8cf08660eceb0c13 /.gitignore
parent	45da0d43fdb73bb7c0a746fb8ea6f588a101cace (diff)
download	minetest-b095dc4f2bf2a1ace010dfae0ead69654b0ca3ac.tar.gz minetest-b095dc4f2bf2a1ace010dfae0ead69654b0ca3ac.tar.bz2 minetest-b095dc4f2bf2a1ace010dfae0ead69654b0ca3ac.zip

Fix error when `item` isn't provided to core.hud_replace_builtin (#12484)

Diffstat (limited to '.gitignore')

0 files changed, 0 insertions, 0 deletions

/* 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 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 Lesser General Public License for more details. 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 "exceptions.h" #include "mapblock.h" #include "serialization.h" 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) { } MapSector::~MapSector() { deleteBlocks(); } void MapSector::deleteBlocks() { // Clear cache m_block_cache = NULL; // Delete all for (UNORDERED_MAP<s16, MapBlock*>::iterator i = m_blocks.begin(); i != m_blocks.end(); ++i) { delete i->second; } // Clear container m_blocks.clear(); } MapBlock * MapSector::getBlockBuffered(s16 y) { MapBlock *block; if (m_block_cache != NULL && y == m_block_cache_y) { return m_block_cache; } // If block doesn't exist, return NULL UNORDERED_MAP<s16, MapBlock*>::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; } MapBlock * MapSector::getBlockNoCreateNoEx(s16 y) { return getBlockBuffered(y); } MapBlock * MapSector::createBlankBlockNoInsert(s16 y) { assert(getBlockBuffered(y) == NULL); // Pre-condition v3s16 blockpos_map(m_pos.X, y, m_pos.Y); MapBlock *block = new MapBlock(m_parent, blockpos_map, m_gamedef); return block; } MapBlock * MapSector::createBlankBlock(s16 y) { MapBlock *block = createBlankBlockNoInsert(y); m_blocks[y] = block; return block; } void MapSector::insertBlock(MapBlock *block) { s16 block_y = block->getPos().Y; 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::deleteBlock(MapBlock *block) { s16 block_y = block->getPos().Y; // Clear from cache m_block_cache = NULL; // Remove from container m_blocks.erase(block_y); // Delete delete block; } void MapSector::getBlocks(MapBlockVect &dest) { for (UNORDERED_MAP<s16, MapBlock*>::iterator bi = m_blocks.begin(); bi != m_blocks.end(); ++bi) { dest.push_back(bi->second); } } /* ServerMapSector */ ServerMapSector::ServerMapSector(Map *parent, v2s16 pos, IGameDef *gamedef): MapSector(parent, pos, gamedef) { } ServerMapSector::~ServerMapSector() { } 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; } else { 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) { } ClientMapSector::~ClientMapSector() { } #endif // !SERVER //END


context:
space:
mode: