Permalink
Browse files

Create empty default constructor for MapNode

  • Loading branch information...
Zeno- committed Jan 17, 2015
1 parent 2f0a8f1 commit 805c8e51e5dd4dfad381a0d40b4388b5de90becf
Showing with 21 additions and 12 deletions.
  1. +12 −3 src/map.cpp
  2. +2 −2 src/map.h
  3. +4 −1 src/mapnode.h
  4. +1 −2 src/test.cpp
  5. +2 −4 src/voxel.cpp
@@ -1189,8 +1189,7 @@ void Map::removeNodeAndUpdate(v3s16 p,
This also clears the lighting.
*/

MapNode n;
n.setContent(replace_material);
MapNode n(replace_material);
setNode(p, n);

for(s32 i=0; i<2; i++)
@@ -1603,6 +1602,16 @@ struct NodeNeighbor {
NeighborType t;
v3s16 p;
bool l; //can liquid

NodeNeighbor()
: n(CONTENT_AIR)
{ }

NodeNeighbor(const MapNode &node, NeighborType n_type, v3s16 pos)
: n(node),
t(n_type),
p(pos)
{ }
};

void Map::transforming_liquid_add(v3s16 p) {
@@ -1716,7 +1725,7 @@ void Map::transformLiquids(std::map<v3s16, MapBlock*> & modified_blocks)
break;
}
v3s16 npos = p0 + dirs[i];
NodeNeighbor nb = {getNodeNoEx(npos), nt, npos};
NodeNeighbor nb(getNodeNoEx(npos), nt, npos);
switch (nodemgr->get(nb.n.getContent()).liquid_type) {
case LIQUID_NONE:
if (nb.n.getContent() == CONTENT_AIR) {
@@ -80,9 +80,9 @@ struct MapEditEvent

MapEditEvent():
type(MEET_OTHER),
n(CONTENT_AIR),
already_known_by_peer(0)
{
}
{ }

MapEditEvent * clone()
{
@@ -139,12 +139,15 @@ struct MapNode
*/
u8 param2;

MapNode()
{ }

MapNode(const MapNode & n)
{
*this = n;
}

MapNode(content_t content = CONTENT_AIR, u8 a_param1=0, u8 a_param2=0)
MapNode(content_t content, u8 a_param1=0, u8 a_param2=0)
: param0(content),
param1(a_param1),
param2(a_param2)
@@ -855,9 +855,8 @@ struct TestMapNode: public TestBase
{
void Run(INodeDefManager *nodedef)
{
MapNode n;
MapNode n(CONTENT_AIR);

// Default values
UASSERT(n.getContent() == CONTENT_AIR);
UASSERT(n.getLight(LIGHTBANK_DAY, nodedef) == 0);
UASSERT(n.getLight(LIGHTBANK_NIGHT, nodedef) == 0);
@@ -173,10 +173,8 @@ void VoxelManipulator::addArea(const VoxelArea &area)
dstream<<", new_size="<<new_size;
dstream<<std::endl;*/

// Allocate and clear new data
// FIXME: UGLY KLUDGE because MapNode default constructor is FUBAR; it
// initialises data that is going to be overwritten anyway
MapNode *new_data = (MapNode*)new char[new_size * sizeof (*new_data)];
// Allocate new data and clear flags
MapNode *new_data = new MapNode[new_size];
assert(new_data);
u8 *new_flags = new u8[new_size];
assert(new_flags);

0 comments on commit 805c8e5

Please sign in to comment.