diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/map.cpp | 57 | ||||
| -rw-r--r-- | src/map.h | 9 | ||||
| -rw-r--r-- | src/mapblock.cpp | 4 |
3 files changed, 2 insertions, 68 deletions
diff --git a/src/map.cpp b/src/map.cpp index d4734cdc6..972c666e4 100644 --- a/src/map.cpp +++ b/src/map.cpp @@ -362,63 +362,6 @@ bool Map::removeNodeWithEvent(v3s16 p) return succeeded; } -bool Map::getDayNightDiff(v3s16 blockpos) -{ - try{ - v3s16 p = blockpos + v3s16(0,0,0); - MapBlock *b = getBlockNoCreate(p); - if(b->getDayNightDiff()) - return true; - } - catch(InvalidPositionException &e){} - // Leading edges - try{ - v3s16 p = blockpos + v3s16(-1,0,0); - MapBlock *b = getBlockNoCreate(p); - if(b->getDayNightDiff()) - return true; - } - catch(InvalidPositionException &e){} - try{ - v3s16 p = blockpos + v3s16(0,-1,0); - MapBlock *b = getBlockNoCreate(p); - if(b->getDayNightDiff()) - return true; - } - catch(InvalidPositionException &e){} - try{ - v3s16 p = blockpos + v3s16(0,0,-1); - MapBlock *b = getBlockNoCreate(p); - if(b->getDayNightDiff()) - return true; - } - catch(InvalidPositionException &e){} - // Trailing edges - try{ - v3s16 p = blockpos + v3s16(1,0,0); - MapBlock *b = getBlockNoCreate(p); - if(b->getDayNightDiff()) - return true; - } - catch(InvalidPositionException &e){} - try{ - v3s16 p = blockpos + v3s16(0,1,0); - MapBlock *b = getBlockNoCreate(p); - if(b->getDayNightDiff()) - return true; - } - catch(InvalidPositionException &e){} - try{ - v3s16 p = blockpos + v3s16(0,0,1); - MapBlock *b = getBlockNoCreate(p); - if(b->getDayNightDiff()) - return true; - } - catch(InvalidPositionException &e){} - - return false; -} - struct TimeOrderedMapBlock { MapSector *sect; MapBlock *block; @@ -216,15 +216,6 @@ public: bool addNodeWithEvent(v3s16 p, MapNode n, bool remove_metadata = true); bool removeNodeWithEvent(v3s16 p); - /* - Takes the blocks at the edges into account - */ - bool getDayNightDiff(v3s16 blockpos); - - //core::aabbox3d<s16> getDisplayedBlockArea(); - - //bool updateChangedVisibleArea(); - // Call these before and after saving of many blocks virtual void beginSave() { return; } virtual void endSave() { return; } diff --git a/src/mapblock.cpp b/src/mapblock.cpp index ed4f09692..910e91316 100644 --- a/src/mapblock.cpp +++ b/src/mapblock.cpp @@ -361,7 +361,7 @@ void MapBlock::actuallyUpdateDayNightDiff() return; } - bool differs; + bool differs = false; /* Check if any lighting value differs @@ -465,7 +465,7 @@ static void getBlockNodeIdMapping(NameIdMapping *nimap, MapNode *nodes, const ContentFeatures &f = nodedef->get(global_id); const std::string &name = f.name; - if(name == "") + if (name.empty()) unknown_contents.insert(global_id); else nimap->set(id, name); |