diff options
author | Kahrl <kahrl@gmx.net> | 2012-01-21 00:11:44 +0100 |
---|---|---|
committer | Perttu Ahola <celeron55@gmail.com> | 2012-01-22 17:24:50 +0200 |
commit | 157a4cf18cb9c098f465b8baecd7d2cd5705f2dd (patch) | |
tree | a194b86e0452d1dc892aec6b3ac940327ce85e2a /src/content_mapblock.cpp | |
parent | f22c73f50169b978f13c0b6511805b9d4a1a6871 (diff) | |
download | minetest-157a4cf18cb9c098f465b8baecd7d2cd5705f2dd.tar.gz minetest-157a4cf18cb9c098f465b8baecd7d2cd5705f2dd.tar.bz2 minetest-157a4cf18cb9c098f465b8baecd7d2cd5705f2dd.zip |
Node placement / mineral / serialization / iron freq / node_dig callback
- Node placement code moved to Lua
- Mineral system removed (added default:stone_with_coal and default:stone_with_iron).
- MapBlock and MapNode serialization updated.
- Mapgen: Frequency of iron increased.
- node_dig callback and related changes.
Diffstat (limited to 'src/content_mapblock.cpp')
-rw-r--r-- | src/content_mapblock.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/content_mapblock.cpp b/src/content_mapblock.cpp index 79f49cbf8..dc1e1daed 100644 --- a/src/content_mapblock.cpp +++ b/src/content_mapblock.cpp @@ -85,15 +85,15 @@ void makeCuboid(MeshCollector *collector, const aabb3f &box, video::S3DVertex(min.X,min.Y,min.Z, -1,0,0, c, txc[14],txc[15]), video::S3DVertex(min.X,min.Y,max.Z, -1,0,0, c, txc[12],txc[15]), // back - video::S3DVertex(min.X,max.Y,min.Z, 0,0,-1, c, txc[16],txc[17]), - video::S3DVertex(max.X,max.Y,min.Z, 0,0,-1, c, txc[18],txc[17]), - video::S3DVertex(max.X,min.Y,min.Z, 0,0,-1, c, txc[18],txc[19]), - video::S3DVertex(min.X,min.Y,min.Z, 0,0,-1, c, txc[16],txc[19]), + video::S3DVertex(max.X,max.Y,max.Z, 0,0,1, c, txc[16],txc[17]), + video::S3DVertex(min.X,max.Y,max.Z, 0,0,1, c, txc[18],txc[17]), + video::S3DVertex(min.X,min.Y,max.Z, 0,0,1, c, txc[18],txc[19]), + video::S3DVertex(max.X,min.Y,max.Z, 0,0,1, c, txc[16],txc[19]), // front - video::S3DVertex(max.X,max.Y,max.Z, 0,0,1, c, txc[20],txc[21]), - video::S3DVertex(min.X,max.Y,max.Z, 0,0,1, c, txc[22],txc[21]), - video::S3DVertex(min.X,min.Y,max.Z, 0,0,1, c, txc[22],txc[23]), - video::S3DVertex(max.X,min.Y,max.Z, 0,0,1, c, txc[20],txc[23]), + video::S3DVertex(min.X,max.Y,min.Z, 0,0,-1, c, txc[20],txc[21]), + video::S3DVertex(max.X,max.Y,min.Z, 0,0,-1, c, txc[22],txc[21]), + video::S3DVertex(max.X,min.Y,min.Z, 0,0,-1, c, txc[22],txc[23]), + video::S3DVertex(min.X,min.Y,min.Z, 0,0,-1, c, txc[20],txc[23]), }; for(s32 j=0; j<24; j++) @@ -602,7 +602,7 @@ void mapblock_mesh_generate_special(MeshMakeData *data, break; case NDT_TORCHLIKE: { - v3s16 dir = unpackDir(n.param2); + v3s16 dir = n.getWallMountedDir(nodedef); AtlasPointer ap(0); if(dir == v3s16(0,-1,0)){ @@ -694,7 +694,7 @@ void mapblock_mesh_generate_special(MeshMakeData *data, ap.x0(), ap.y1()), }; - v3s16 dir = unpackDir(n.param2); + v3s16 dir = n.getWallMountedDir(nodedef); for(s32 i=0; i<4; i++) { |