]> git.lizzy.rs Git - dragonfireclient.git/blobdiff - src/unittest/test.cpp
Merge branch 'master' of https://github.com/minetest/minetest
[dragonfireclient.git] / src / unittest / test.cpp
index 4fd4b930b65f148bd77ffb46f025e6829b87760f..e8957afd006514124805649f40e5a31793716282 100644 (file)
@@ -535,7 +535,7 @@ struct TestMapBlock: public TestBase
                        parent.node.setContent(CONTENT_AIR);
                        parent.node.setLight(LIGHTBANK_DAY, LIGHT_SUN);
                        parent.node.setLight(LIGHTBANK_NIGHT, 0);
-                       core::map<v3s16, bool> light_sources;
+                       std::map<v3s16, bool> light_sources;
                        // The bottom block is invalid, because we have a shadowing node
                        UASSERT(b.propagateSunlight(light_sources) == false);
                        UASSERT(b.getNode(v3s16(1,4,0)).getLight(LIGHTBANK_DAY) == LIGHT_SUN);
@@ -562,7 +562,7 @@ struct TestMapBlock: public TestBase
                        parent.position_valid = true;
                        b.setIsUnderground(true);
                        parent.node.setLight(LIGHTBANK_DAY, LIGHT_MAX/2);
-                       core::map<v3s16, bool> light_sources;
+                       std::map<v3s16, bool> light_sources;
                        // The block below should be valid because there shouldn't be
                        // sunlight in there either
                        UASSERT(b.propagateSunlight(light_sources, true) == true);
@@ -603,7 +603,7 @@ struct TestMapBlock: public TestBase
                        }
                        // Lighting value for the valid nodes
                        parent.node.setLight(LIGHTBANK_DAY, LIGHT_MAX/2);
-                       core::map<v3s16, bool> light_sources;
+                       std::map<v3s16, bool> light_sources;
                        // Bottom block is not valid
                        UASSERT(b.propagateSunlight(light_sources) == false);
                }