diff options
| author | Perttu Ahola <celeron55@gmail.com> | 2011-06-26 01:31:43 +0300 |
|---|---|---|
| committer | Perttu Ahola <celeron55@gmail.com> | 2011-06-26 01:31:43 +0300 |
| commit | 2915bd5518150955ed1581110527f4bb4adadfe8 (patch) | |
| tree | 142947902c6ec80bbe36d949e4af6e7496c27906 /src/mapblock.h | |
| parent | cb130d9158dc4e9c456d088d5e214b7d829ccc3a (diff) | |
| download | minetest-2915bd5518150955ed1581110527f4bb4adadfe8.tar.gz minetest-2915bd5518150955ed1581110527f4bb4adadfe8.tar.bz2 minetest-2915bd5518150955ed1581110527f4bb4adadfe8.zip | |
more reorganizing of map code
Diffstat (limited to 'src/mapblock.h')
| -rw-r--r-- | src/mapblock.h | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/src/mapblock.h b/src/mapblock.h index 693bc5190..8f3b8464a 100644 --- a/src/mapblock.h +++ b/src/mapblock.h @@ -38,6 +38,7 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "mapblock_mesh.h" #endif +class Map; #define BLOCK_TIMESTAMP_UNDEFINED 0xffffffff @@ -81,6 +82,7 @@ enum ModifiedState BLOCKGEN_FULLY_GENERATED=6 };*/ +#if 0 enum { NODECONTAINER_ID_MAPBLOCK, @@ -108,23 +110,24 @@ public: } } }; +#endif /* MapBlock itself */ -class MapBlock : public NodeContainer +class MapBlock /*: public NodeContainer*/ { public: - MapBlock(NodeContainer *parent, v3s16 pos, bool dummy=false); + MapBlock(Map *parent, v3s16 pos, bool dummy=false); ~MapBlock(); - virtual u16 nodeContainerId() const + /*virtual u16 nodeContainerId() const { return NODECONTAINER_ID_MAPBLOCK; - } + }*/ - NodeContainer * getParent() + Map * getParent() { return m_parent; } @@ -640,7 +643,7 @@ private: */ // NOTE: Lots of things rely on this being the Map - NodeContainer *m_parent; + Map *m_parent; // Position in blocks on parent v3s16 m_pos; |