Jordach
/
Minetest
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove unused Map::getDayNightDiff + fix one undefined variable in mapblock.cpp

master
Loic Blot 2017-07-26 23:11:46 +02:00
parent 3e50850260
commit 9d412dd075
No known key found for this signature in database
GPG Key ID: EFAA458E8C153987
3 changed files with 2 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
src/map.cpp
View File

@ -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;

9
src/map.h
View File

@ -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; }

4
src/mapblock.cpp
View File

@ -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);