diff options
| author | Ilya Zhuravlev <zhuravlevilya@ya.ru> | 2012-12-20 21:19:49 +0400 |
|---|---|---|
| committer | kwolekr <kwolekr@minetest.net> | 2013-03-11 19:08:39 -0400 |
| commit | 6a1670dbc31cc0e44178bbd9ad34ff0d5981a060 (patch) | |
| tree | ce32cd4be20e9be30367f2ad25d9dae6a0482898 /src/voxel.h | |
| parent | e204bedf1d781e43b8caa334a99319efc5b7ce46 (diff) | |
| download | minetest-6a1670dbc31cc0e44178bbd9ad34ff0d5981a060.tar.gz minetest-6a1670dbc31cc0e44178bbd9ad34ff0d5981a060.tar.bz2 minetest-6a1670dbc31cc0e44178bbd9ad34ff0d5981a060.zip | |
Migrate to STL containers/algorithms.
Diffstat (limited to 'src/voxel.h')
| -rw-r--r-- | src/voxel.h | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/voxel.h b/src/voxel.h index b48943624..bed35b57e 100644 --- a/src/voxel.h +++ b/src/voxel.h @@ -26,6 +26,8 @@ with this program; if not, write to the Free Software Foundation, Inc., #include <iostream> #include "debug.h" #include "mapnode.h" +#include <set> +#include <list> class INodeDefManager; @@ -186,7 +188,7 @@ public: 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 +521,14 @@ public: // 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 |