Drop luaentity_common.h which is not included anywhere

[dragonfireclient.git] / src / voxelalgorithms.h

diff --git a/src/voxelalgorithms.h b/src/voxelalgorithms.h
index 9c90e18a9d9dba9c5bfe07649af07acfdf20ca7a..2eba6a17646e2a965e4b7b6991c9061aea14d30c 100644 (file)
--- a/src/voxelalgorithms.h
+++ b/src/voxelalgorithms.h
@@ -1,18 +1,18 @@
 /*
-Minetest-c55
-Copyright (C) 2010-2012 celeron55, Perttu Ahola <celeron55@gmail.com>
+Minetest
+Copyright (C) 2010-2013 celeron55, Perttu Ahola <celeron55@gmail.com>
 
 This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
+it under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation; either version 2.1 of the License, or
 (at your option) any later version.
 
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+GNU Lesser General Public License for more details.
 
-You should have received a copy of the GNU General Public License along
+You should have received a copy of the GNU Lesser General Public License along
 with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
@@ -22,6 +22,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 #include "voxel.h"
 #include "mapnode.h"
+#include <set>
+#include <map>
 
 namespace voxalgo
 {
@@ -33,8 +35,8 @@ void setLight(VoxelManipulator &v, VoxelArea a, u8 light,
 
 void clearLightAndCollectSources(VoxelManipulator &v, VoxelArea a,
                enum LightBank bank, INodeDefManager *ndef,
-               core::map<v3s16, bool> & light_sources,
-               core::map<v3s16, u8> & unlight_from);
+               std::set<v3s16> & light_sources,
+               std::map<v3s16, u8> & unlight_from);
 
 struct SunlightPropagateResult
 {
@@ -47,7 +49,7 @@ struct SunlightPropagateResult
 
 SunlightPropagateResult propagateSunlight(VoxelManipulator &v, VoxelArea a,
                bool inexistent_top_provides_sunlight,
-               core::map<v3s16, bool> & light_sources,
+               std::set<v3s16> & light_sources,
                INodeDefManager *ndef);
 
 } // namespace voxalgo