diff options
| author | Perttu Ahola <celeron55@gmail.com> | 2010-12-19 19:11:05 +0200 |
|---|---|---|
| committer | Perttu Ahola <celeron55@gmail.com> | 2010-12-19 19:11:05 +0200 |
| commit | ab7477c4c3e2a3647dc4fb65c71567946d33b0e3 (patch) | |
| tree | fb9aaca70617875ff68f8ba1674f5a6fccd4f385 /src/map.cpp | |
| parent | 0ca9423b8b2cf7bd1435fb09eba7a9f50d444864 (diff) | |
| download | minetest-ab7477c4c3e2a3647dc4fb65c71567946d33b0e3.tar.gz minetest-ab7477c4c3e2a3647dc4fb65c71567946d33b0e3.tar.bz2 minetest-ab7477c4c3e2a3647dc4fb65c71567946d33b0e3.zip | |
added dedicated server build without irrlicht
Diffstat (limited to 'src/map.cpp')
| -rw-r--r-- | src/map.cpp | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/src/map.cpp b/src/map.cpp index 671e74edd..db9d4120e 100644 --- a/src/map.cpp +++ b/src/map.cpp @@ -1062,6 +1062,7 @@ void Map::removeNodeAndUpdate(v3s16 p, } } +#ifndef SERVER void Map::expireMeshes(bool only_daynight_diffed) { TimeTaker timer("expireMeshes()", g_device); @@ -1128,6 +1129,8 @@ void Map::updateMeshes(v3s16 blockpos, u32 daynight_ratio) catch(InvalidPositionException &e){} } +#endif + bool Map::dayNightDiffed(v3s16 blockpos) { try{ @@ -2678,12 +2681,17 @@ void ServerMap::PrintInfo(std::ostream &out) out<<"ServerMap: "; } +#ifndef SERVER + /* ClientMap */ ClientMap::ClientMap( Client *client, + JMutex &range_mutex, + s16 &viewing_range_nodes, + bool &viewing_range_all, scene::ISceneNode* parent, scene::ISceneManager* mgr, s32 id @@ -2691,7 +2699,10 @@ ClientMap::ClientMap( Map(dout_client), scene::ISceneNode(parent, mgr, id), m_client(client), - mesh(NULL) + mesh(NULL), + m_range_mutex(range_mutex), + m_viewing_range_nodes(viewing_range_nodes), + m_viewing_range_all(viewing_range_all) { mesh_mutex.Init(); @@ -2805,9 +2816,9 @@ void ClientMap::renderMap(video::IVideoDriver* driver, s32 pass) s16 viewing_range_nodes; bool viewing_range_all; { - JMutexAutoLock lock(g_range_mutex); - viewing_range_nodes = g_viewing_range_nodes; - viewing_range_all = g_viewing_range_all; + JMutexAutoLock lock(m_range_mutex); + viewing_range_nodes = m_viewing_range_nodes; + viewing_range_all = m_viewing_range_all; } m_camera_mutex.Lock(); @@ -3042,6 +3053,7 @@ void ClientMap::PrintInfo(std::ostream &out) out<<"ClientMap: "; } +#endif // !SERVER /* MapVoxelManipulator |