From: Perttu Ahola <celeron55@gmail.com>
Date: Mon, 4 Apr 2011 02:25:55 +0000 (+0300)
Subject: now the server builds
X-Git-Url: http://81.2.79.47:8989/gitweb/?a=commitdiff_plain;h=a9f89fb3fb72a57828ebceaeb4b469a005c11541;p=zefram%2Fminetest%2Fminetest_engine.git

now the server builds
---

diff --git a/src/mapblock.cpp b/src/mapblock.cpp
index c14fbd04..efa760f0 100644
--- a/src/mapblock.cpp
+++ b/src/mapblock.cpp
@@ -24,6 +24,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "light.h"
 #include <sstream>
 
+#ifndef SERVER
 void MeshMakeData::fill(u32 daynight_ratio, MapBlock *block)
 {
 	m_daynight_ratio = daynight_ratio;
@@ -80,6 +81,7 @@ void MeshMakeData::fill(u32 daynight_ratio, MapBlock *block)
 		}
 	}
 }
+#endif
 
 /*
 	Parameters must consist of air and !air.
@@ -1273,6 +1275,7 @@ scene::SMesh* makeMapBlockMesh(MeshMakeData *data)
 	//std::cout<<"added "<<fastfaces.getSize()<<" faces."<<std::endl;
 }
 
+#endif // !SERVER
 
 /*
 	MapBlock
@@ -1381,6 +1384,8 @@ MapNode MapBlock::getNodeParentNoEx(v3s16 p)
 	}
 }
 
+#ifndef SERVER
+
 #if 1
 void MapBlock::updateMesh(u32 daynight_ratio)
 {
diff --git a/src/mapblock.h b/src/mapblock.h
index 87abf6a8..a77bf40c 100644
--- a/src/mapblock.h
+++ b/src/mapblock.h
@@ -174,6 +174,8 @@ public:
 
 class MapBlock;
 
+#ifndef SERVER
+
 struct MeshMakeData
 {
 	u32 m_daynight_ratio;
@@ -188,11 +190,13 @@ struct MeshMakeData
 	void fill(u32 daynight_ratio, MapBlock *block);
 };
 
+scene::SMesh* makeMapBlockMesh(MeshMakeData *data);
+
+#endif
+
 u8 getFaceLight(u32 daynight_ratio, MapNode n, MapNode n2,
 		v3s16 face_dir);
 
-scene::SMesh* makeMapBlockMesh(MeshMakeData *data);
-
 /*
 	MapBlock itself
 */