Do the same for LevelDB interface

[minetest.git] / src / voxel.h

diff --git a/src/voxel.h b/src/voxel.h
index b48943624f2a7325ced98a64892c0d9e8a8d0d8e..fa459444ff5a539b0b19eab57398e8a29b8cd301 100644 (file)
--- a/src/voxel.h
+++ b/src/voxel.h
@@ -22,10 +22,13 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 #include "irrlichttypes.h"
 #include "irr_v3d.h"
-#include <irrList.h>
 #include <iostream>
 #include "debug.h"
+#include "exceptions.h"
 #include "mapnode.h"
+#include <set>
+#include <list>
+#include <map>
 
 class INodeDefManager;
 
@@ -186,7 +189,7 @@ class VoxelArea
 
                a: area inside *this
        */
-       void diff(const VoxelArea &a, core::list<VoxelArea> &result)
+       void diff(const VoxelArea &a, std::list<VoxelArea> &result)
        {
                /*
                        This can result in a maximum of 6 areas
@@ -519,14 +522,14 @@ class VoxelManipulator /*: public NodeContainer*/
        // TODO: Move to voxelalgorithms.h
 
        void unspreadLight(enum LightBank bank, v3s16 p, u8 oldlight,
-                       core::map<v3s16, bool> & light_sources, INodeDefManager *nodemgr);
+                       std::set<v3s16> & light_sources, INodeDefManager *nodemgr);
        void unspreadLight(enum LightBank bank,
-                       core::map<v3s16, u8> & from_nodes,
-                       core::map<v3s16, bool> & light_sources, INodeDefManager *nodemgr);
+                       std::map<v3s16, u8> & from_nodes,
+                       std::set<v3s16> & light_sources, INodeDefManager *nodemgr);
 
        void spreadLight(enum LightBank bank, v3s16 p, INodeDefManager *nodemgr);
        void spreadLight(enum LightBank bank,
-                       core::map<v3s16, bool> & from_nodes, INodeDefManager *nodemgr);
+                       std::set<v3s16> & from_nodes, INodeDefManager *nodemgr);
 
        /*
                Virtual functions