oerkki/minetest
oerkki
/
minetest
2
1
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

now the server builds

This commit is contained in:
Perttu Ahola 2011-04-04 05:25:55 +03:00
parent 023fc5b771
commit a9f89fb3fb
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/mapblock.cpp
View File

@ -24,6 +24,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include "light.h" #include "light.h"
#include <sstream> #include <sstream>
#ifndef SERVER
void MeshMakeData::fill(u32 daynight_ratio, MapBlock *block) void MeshMakeData::fill(u32 daynight_ratio, MapBlock *block)
{ {
m_daynight_ratio = daynight_ratio; 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. Parameters must consist of air and !air.
@ -1273,6 +1275,7 @@ scene::SMesh* makeMapBlockMesh(MeshMakeData *data)
//std::cout<<"added "<<fastfaces.getSize()<<" faces."<<std::endl; //std::cout<<"added "<<fastfaces.getSize()<<" faces."<<std::endl;
} }
#endif // !SERVER
/* /*
MapBlock MapBlock
@ -1381,6 +1384,8 @@ MapNode MapBlock::getNodeParentNoEx(v3s16 p)
} }
} }
#ifndef SERVER
#if 1 #if 1
void MapBlock::updateMesh(u32 daynight_ratio) void MapBlock::updateMesh(u32 daynight_ratio)
{ {

8
src/mapblock.h
View File

@ -174,6 +174,8 @@ public:
class MapBlock; class MapBlock;
#ifndef SERVER
struct MeshMakeData struct MeshMakeData
{ {
u32 m_daynight_ratio; u32 m_daynight_ratio;
@ -188,11 +190,13 @@ struct MeshMakeData
void fill(u32 daynight_ratio, MapBlock *block); void fill(u32 daynight_ratio, MapBlock *block);
}; };
scene::SMesh* makeMapBlockMesh(MeshMakeData *data);
#endif
u8 getFaceLight(u32 daynight_ratio, MapNode n, MapNode n2, u8 getFaceLight(u32 daynight_ratio, MapNode n, MapNode n2,
v3s16 face_dir); v3s16 face_dir);
scene::SMesh* makeMapBlockMesh(MeshMakeData *data);
/* /*
MapBlock itself MapBlock itself
*/ */