summaryrefslogtreecommitdiff
path: root/src/map.h
diff options
context:
space:
mode:
authorPerttu Ahola <celeron55@gmail.com>2010-12-19 19:11:05 +0200
committerPerttu Ahola <celeron55@gmail.com>2010-12-19 19:11:05 +0200
commitab7477c4c3e2a3647dc4fb65c71567946d33b0e3 (patch)
treefb9aaca70617875ff68f8ba1674f5a6fccd4f385 /src/map.h
parent0ca9423b8b2cf7bd1435fb09eba7a9f50d444864 (diff)
downloadminetest-ab7477c4c3e2a3647dc4fb65c71567946d33b0e3.tar.gz
minetest-ab7477c4c3e2a3647dc4fb65c71567946d33b0e3.tar.bz2
minetest-ab7477c4c3e2a3647dc4fb65c71567946d33b0e3.zip
added dedicated server build without irrlicht
Diffstat (limited to 'src/map.h')
-rw-r--r--src/map.h17
1 files changed, 15 insertions, 2 deletions
diff --git a/src/map.h b/src/map.h
index d04d647e6..581708a36 100644
--- a/src/map.h
+++ b/src/map.h
@@ -376,13 +376,15 @@ public:
void removeNodeAndUpdate(v3s16 p,
core::map<v3s16, MapBlock*> &modified_blocks);
+#ifndef SERVER
+ void expireMeshes(bool only_daynight_diffed);
+
/*
Updates the faces of the given block and blocks on the
leading edge.
*/
void updateMeshes(v3s16 blockpos, u32 daynight_ratio);
-
- void expireMeshes(bool only_daynight_diffed);
+#endif
/*
Takes the blocks at the trailing edges into account
@@ -535,6 +537,8 @@ private:
bool m_map_saving_enabled;
};
+#ifndef SERVER
+
class Client;
class ClientMap : public Map, public scene::ISceneNode
@@ -542,6 +546,9 @@ class ClientMap : public Map, public scene::ISceneNode
public:
ClientMap(
Client *client,
+ JMutex &range_mutex,
+ s16 &viewing_range_nodes,
+ bool &viewing_range_all,
scene::ISceneNode* parent,
scene::ISceneManager* mgr,
s32 id
@@ -600,8 +607,14 @@ private:
// This is the master heightmap mesh
scene::SMesh *mesh;
JMutex mesh_mutex;
+
+ JMutex &m_range_mutex;
+ s16 &m_viewing_range_nodes;
+ bool &m_viewing_range_all;
};
+#endif
+
class MapVoxelManipulator : public VoxelManipulator
{
public: