minetest
/
minetest
mirror of https://github.com/minetest/minetest.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Create empty default constructor for MapNode

This commit is contained in:
Craig Robbins 2015-01-17 19:19:26 +10:00
parent 2f0a8f1c3e
commit 805c8e51e5
5 changed files with 21 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/map.cpp
View File

@ -1189,8 +1189,7 @@ void Map::removeNodeAndUpdate(v3s16 p,
This also clears the lighting. This also clears the lighting.
*/ */
MapNode n; MapNode n(replace_material);
n.setContent(replace_material);
setNode(p, n); setNode(p, n);
for(s32 i=0; i<2; i++) for(s32 i=0; i<2; i++)
@ -1603,6 +1602,16 @@ struct NodeNeighbor {
NeighborType t; NeighborType t;
v3s16 p; v3s16 p;
bool l; //can liquid 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) { void Map::transforming_liquid_add(v3s16 p) {
@ -1716,7 +1725,7 @@ void Map::transformLiquids(std::map<v3s16, MapBlock*> & modified_blocks)
break; break;
} }
v3s16 npos = p0 + dirs[i]; 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) { switch (nodemgr->get(nb.n.getContent()).liquid_type) {
case LIQUID_NONE: case LIQUID_NONE:
if (nb.n.getContent() == CONTENT_AIR) { if (nb.n.getContent() == CONTENT_AIR) {

4
src/map.h
View File

@ -80,9 +80,9 @@ struct MapEditEvent
MapEditEvent(): MapEditEvent():
type(MEET_OTHER), type(MEET_OTHER),
n(CONTENT_AIR),
already_known_by_peer(0) already_known_by_peer(0)
{ { }
}
MapEditEvent * clone() MapEditEvent * clone()
{ {

5
src/mapnode.h
View File

@ -139,12 +139,15 @@ struct MapNode
*/ */
u8 param2; u8 param2;
MapNode()
{ }
MapNode(const MapNode & n) MapNode(const MapNode & n)
{ {
*this = 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), : param0(content),
param1(a_param1), param1(a_param1),
param2(a_param2) param2(a_param2)

3
src/test.cpp
View File

@ -855,9 +855,8 @@ struct TestMapNode: public TestBase
{ {
void Run(INodeDefManager *nodedef) void Run(INodeDefManager *nodedef)
{ {
MapNode n; MapNode n(CONTENT_AIR);
// Default values
UASSERT(n.getContent() == CONTENT_AIR); UASSERT(n.getContent() == CONTENT_AIR);
UASSERT(n.getLight(LIGHTBANK_DAY, nodedef) == 0); UASSERT(n.getLight(LIGHTBANK_DAY, nodedef) == 0);
UASSERT(n.getLight(LIGHTBANK_NIGHT, nodedef) == 0); UASSERT(n.getLight(LIGHTBANK_NIGHT, nodedef) == 0);

6
src/voxel.cpp
View File

@ -173,10 +173,8 @@ void VoxelManipulator::addArea(const VoxelArea &area)
dstream<<", new_size="<<new_size; dstream<<", new_size="<<new_size;
dstream<<std::endl;*/ dstream<<std::endl;*/
// Allocate and clear new data // Allocate new data and clear flags
// FIXME: UGLY KLUDGE because MapNode default constructor is FUBAR; it MapNode *new_data = new MapNode[new_size];
// initialises data that is going to be overwritten anyway
MapNode *new_data = (MapNode*)new char[new_size * sizeof (*new_data)];
assert(new_data); assert(new_data);
u8 *new_flags = new u8[new_size]; u8 *new_flags = new u8[new_size];
assert(new_flags); assert(new_flags);