diff options
| author | Perttu Ahola <celeron55@gmail.com> | 2011-06-26 00:03:58 +0300 |
|---|---|---|
| committer | Perttu Ahola <celeron55@gmail.com> | 2011-06-26 00:03:58 +0300 |
| commit | cb130d9158dc4e9c456d088d5e214b7d829ccc3a (patch) | |
| tree | d0cbfe1549e74d383de10daafa02ad1bb3315821 /src/map.h | |
| parent | a80025c352fb91ff295423940b3ded22755b70f0 (diff) | |
| download | minetest-cb130d9158dc4e9c456d088d5e214b7d829ccc3a.tar.gz minetest-cb130d9158dc4e9c456d088d5e214b7d829ccc3a.tar.bz2 minetest-cb130d9158dc4e9c456d088d5e214b7d829ccc3a.zip | |
cleaned map stuff
Diffstat (limited to 'src/map.h')
| -rw-r--r-- | src/map.h | 11 |
1 files changed, 8 insertions, 3 deletions
@@ -21,6 +21,7 @@ with this program; if not, write to the Free Software Foundation, Inc., #define MAP_HEADER #include <jmutex.h> +#include <jmutexautolock.h> #include <jthread.h> #include <iostream> @@ -35,12 +36,17 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "common_irrlicht.h" #include "mapnode.h" #include "mapblock.h" -#include "mapsector.h" #include "constants.h" #include "voxel.h" #include "mapchunk.h" #include "nodemetadata.h" +class MapSector; +class ServerMapSector; +class ClientMapSector; + +class MapBlock; + namespace mapgen{ struct BlockMakeData; }; @@ -321,7 +327,6 @@ protected: core::map<MapEventReceiver*, bool> m_event_receivers; core::map<v2s16, MapSector*> m_sectors; - //JMutex m_sector_mutex; // Be sure to set this to NULL when the cached sector is deleted MapSector *m_sector_cache; @@ -547,7 +552,7 @@ public: */ MapSector * emergeSector(v2s16 p); - void deSerializeSector(v2s16 p2d, std::istream &is); + //void deSerializeSector(v2s16 p2d, std::istream &is); /* ISceneNode methods |