diff options
author | teddydestodes <derkomtur@schattengang.net> | 2011-06-01 14:11:52 +0200 |
---|---|---|
committer | teddydestodes <derkomtur@schattengang.net> | 2011-06-01 14:11:52 +0200 |
commit | 4ddf2bc8a2531e158d63e92325319f21bea9278d (patch) | |
tree | 1a28b7a0b2b454354f2dfdab278b51b0cc741f28 /src/mapnode.cpp | |
parent | 9de57d13bc7a97fba17da5807e1ef57d96586deb (diff) | |
parent | 5f52a622b6a2602742ea472c1163eba2acf17fb6 (diff) | |
download | minetest-4ddf2bc8a2531e158d63e92325319f21bea9278d.tar.gz minetest-4ddf2bc8a2531e158d63e92325319f21bea9278d.tar.bz2 minetest-4ddf2bc8a2531e158d63e92325319f21bea9278d.zip |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'src/mapnode.cpp')
-rw-r--r-- | src/mapnode.cpp | 27 |
1 files changed, 27 insertions, 0 deletions
diff --git a/src/mapnode.cpp b/src/mapnode.cpp index c006b8222..cef9bbf03 100644 --- a/src/mapnode.cpp +++ b/src/mapnode.cpp @@ -189,6 +189,22 @@ void init_mapnode() f->is_ground_content = true; f->dug_item = std::string("MaterialItem ")+itos(CONTENT_SAND)+" 1"; + i = CONTENT_CLAY; + f = &g_content_features[i]; + f->setAllTextures("clay.png"); + f->setInventoryTextureCube("clay.png", "clay.png", "clay.png"); + f->param_type = CPT_MINERAL; + f->is_ground_content = true; + f->dug_item = std::string("CraftItem lump_of_clay 4"); + + i = CONTENT_BRICK; + f = &g_content_features[i]; + f->setAllTextures("brick.png"); + f->setInventoryTextureCube("brick.png", "brick.png", "brick.png"); + f->param_type = CPT_MINERAL; + f->is_ground_content = true; + f->dug_item = std::string("CraftItem clay_brick 4"); + i = CONTENT_TREE; f = &g_content_features[i]; f->setAllTextures("tree.png"); @@ -215,6 +231,16 @@ void init_mapnode() } f->dug_item = std::string("MaterialItem ")+itos(i)+" 1"; + i = CONTENT_CACTUS; + f = &g_content_features[i]; + f->setAllTextures("cactus_side.png"); + f->setTexture(0, "cactus_top.png"); + f->setTexture(1, "cactus_top.png"); + f->setInventoryTextureCube("cactus_top.png", "cactus_side.png", "cactus_side.png"); + f->param_type = CPT_MINERAL; + f->is_ground_content = true; + f->dug_item = std::string("MaterialItem ")+itos(i)+" 1"; + i = CONTENT_GLASS; f = &g_content_features[i]; f->light_propagates = true; @@ -226,6 +252,7 @@ void init_mapnode() i = CONTENT_FENCE; f = &g_content_features[i]; + f->setInventoryTexture("fence.png"); f->light_propagates = true; f->param_type = CPT_LIGHT; f->is_ground_content = true; |