summaryrefslogtreecommitdiff
path: root/src/mapsector.h
diff options
context:
space:
mode:
authorPerttu Ahola <celeron55@gmail.com>2011-06-26 01:31:43 +0300
committerPerttu Ahola <celeron55@gmail.com>2011-06-26 01:31:43 +0300
commit2915bd5518150955ed1581110527f4bb4adadfe8 (patch)
tree142947902c6ec80bbe36d949e4af6e7496c27906 /src/mapsector.h
parentcb130d9158dc4e9c456d088d5e214b7d829ccc3a (diff)
downloadminetest-2915bd5518150955ed1581110527f4bb4adadfe8.tar.gz
minetest-2915bd5518150955ed1581110527f4bb4adadfe8.tar.bz2
minetest-2915bd5518150955ed1581110527f4bb4adadfe8.zip
more reorganizing of map code
Diffstat (limited to 'src/mapsector.h')
-rw-r--r--src/mapsector.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/mapsector.h b/src/mapsector.h
index c5a41ca19..44f45d8f0 100644
--- a/src/mapsector.h
+++ b/src/mapsector.h
@@ -30,7 +30,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include <ostream>
class MapBlock;
-class NodeContainer;
+class Map;
/*
This is an Y-wise stack of MapBlocks.
@@ -43,7 +43,7 @@ class MapSector
{
public:
- MapSector(NodeContainer *parent, v2s16 pos);
+ MapSector(Map *parent, v2s16 pos);
virtual ~MapSector();
virtual u32 getId() const = 0;
@@ -73,7 +73,7 @@ protected:
// The pile of MapBlocks
core::map<s16, MapBlock*> m_blocks;
- NodeContainer *m_parent;
+ Map *m_parent;
// Position on parent (in MapBlock widths)
v2s16 m_pos;
@@ -92,7 +92,7 @@ protected:
class ServerMapSector : public MapSector
{
public:
- ServerMapSector(NodeContainer *parent, v2s16 pos);
+ ServerMapSector(Map *parent, v2s16 pos);
~ServerMapSector();
u32 getId() const
@@ -109,7 +109,7 @@ public:
static ServerMapSector* deSerialize(
std::istream &is,
- NodeContainer *parent,
+ Map *parent,
v2s16 p2d,
core::map<v2s16, MapSector*> & sectors
);
@@ -121,7 +121,7 @@ private:
class ClientMapSector : public MapSector
{
public:
- ClientMapSector(NodeContainer *parent, v2s16 pos);
+ ClientMapSector(Map *parent, v2s16 pos);
~ClientMapSector();
u32 getId() const