diff options
Diffstat (limited to 'src/unittest')
| -rw-r--r-- | src/unittest/test_mapnode.cpp | 5 | ||||
| -rw-r--r-- | src/unittest/test_voxelalgorithms.cpp | 20 |
2 files changed, 13 insertions, 12 deletions
diff --git a/src/unittest/test_mapnode.cpp b/src/unittest/test_mapnode.cpp index 365ee0c86..9a5c69bed 100644 --- a/src/unittest/test_mapnode.cpp +++ b/src/unittest/test_mapnode.cpp @@ -47,9 +47,10 @@ void TestMapNode::testNodeProperties(const NodeDefManager *nodedef) { MapNode n(CONTENT_AIR); + ContentLightingFlags f = nodedef->getLightingFlags(n); UASSERT(n.getContent() == CONTENT_AIR); - UASSERT(n.getLight(LIGHTBANK_DAY, nodedef) == 0); - UASSERT(n.getLight(LIGHTBANK_NIGHT, nodedef) == 0); + UASSERT(n.getLight(LIGHTBANK_DAY, f) == 0); + UASSERT(n.getLight(LIGHTBANK_NIGHT, f) == 0); // Transparency n.setContent(CONTENT_AIR); diff --git a/src/unittest/test_voxelalgorithms.cpp b/src/unittest/test_voxelalgorithms.cpp index abe48893f..6514d3713 100644 --- a/src/unittest/test_voxelalgorithms.cpp +++ b/src/unittest/test_voxelalgorithms.cpp @@ -138,27 +138,27 @@ void TestVoxelAlgorithms::testLighting(IGameDef *gamedef) const NodeDefManager *ndef = gamedef->ndef(); { MapNode n = map.getNode(v3s16(9, 9, -9)); - UASSERTEQ(int, n.getLight(LIGHTBANK_NIGHT, ndef), 0); - UASSERTEQ(int, n.getLight(LIGHTBANK_DAY, ndef), 13); + UASSERTEQ(int, n.getLight(LIGHTBANK_NIGHT, ndef->getLightingFlags(n)), 0); + UASSERTEQ(int, n.getLight(LIGHTBANK_DAY, ndef->getLightingFlags(n)), 13); } { MapNode n = map.getNode(v3s16(0, 1, 0)); - UASSERTEQ(int, n.getLight(LIGHTBANK_NIGHT, ndef), 12); - UASSERTEQ(int, n.getLight(LIGHTBANK_DAY, ndef), 12); + UASSERTEQ(int, n.getLight(LIGHTBANK_NIGHT, ndef->getLightingFlags(n)), 12); + UASSERTEQ(int, n.getLight(LIGHTBANK_DAY, ndef->getLightingFlags(n)), 12); } { MapNode n = map.getNode(v3s16(-9, -1, 0)); - UASSERTEQ(int, n.getLight(LIGHTBANK_NIGHT, ndef), 3); - UASSERTEQ(int, n.getLight(LIGHTBANK_DAY, ndef), 12); + UASSERTEQ(int, n.getLight(LIGHTBANK_NIGHT, ndef->getLightingFlags(n)), 3); + UASSERTEQ(int, n.getLight(LIGHTBANK_DAY, ndef->getLightingFlags(n)), 12); } { MapNode n = map.getNode(v3s16(-10, 0, 0)); - UASSERTEQ(int, n.getLight(LIGHTBANK_NIGHT, ndef), 3); - UASSERTEQ(int, n.getLight(LIGHTBANK_DAY, ndef), 14); + UASSERTEQ(int, n.getLight(LIGHTBANK_NIGHT, ndef->getLightingFlags(n)), 3); + UASSERTEQ(int, n.getLight(LIGHTBANK_DAY, ndef->getLightingFlags(n)), 14); } { MapNode n = map.getNode(v3s16(-11, 0, 0)); - UASSERTEQ(int, n.getLight(LIGHTBANK_NIGHT, ndef), 2); - UASSERTEQ(int, n.getLight(LIGHTBANK_DAY, ndef), 15); + UASSERTEQ(int, n.getLight(LIGHTBANK_NIGHT, ndef->getLightingFlags(n)), 2); + UASSERTEQ(int, n.getLight(LIGHTBANK_DAY, ndef->getLightingFlags(n)), 15); } } |