Futuray-pgm
/
voxelands
forked from oerkki/voxelands
1
1
Fork 0
Code Pull Requests Activity

Merge branch 'patch-1' into 'next' 

Removed missing textures' links.

Stair corners' textures have been lost during the previous commit's rebasing.
This patch uses the default brick texture.


See merge request !68
This commit is contained in:
Menche 2016-08-27 23:36:26 +00:00
parent 4ec28ba379 b8ef0053a0
commit 6e89813187
1 changed files with 9 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/content_mapnode_stair.cpp
View File

@ -468,19 +468,15 @@ void content_mapnode_stair(bool repeat)
f = &content_features(i); f = &content_features(i);
f->param_type = CPT_FACEDIR_SIMPLE; f->param_type = CPT_FACEDIR_SIMPLE;
f->rotate_tile_with_nodebox = true; f->rotate_tile_with_nodebox = true;
f->setTexture(0,"brick_stair_corner_top.png"); f->setAllTextures("brick.png");
f->setTexture(1,"brick_bottom.png"); f->setTexture(1,"brick_bottom.png");
f->setTexture(2,"brick_stair_corner_front_2.png");
f->setTexture(3,"brick_stair_corner_front_3.png");
f->setTexture(4,"brick_stair_corner_front_4.png");
f->setTexture(5,"brick_stair_corner_front_5.png");
f->draw_type = CDT_NODEBOX; f->draw_type = CDT_NODEBOX;
f->is_ground_content = true; f->is_ground_content = true;
f->dug_item = std::string("CraftItem clay_brick 24"); f->dug_item = std::string("CraftItem clay_brick 24");
content_nodebox_stair_corner(f); content_nodebox_stair_corner(f);
f->setInventoryTextureNodeBox(i,"brick_stair_corner_top.png", f->setInventoryTextureNodeBox(i,"brick.png",
"brick_stair_corner_front_5.png", "brick.png",
"brick_stair_corner_front_2.png"); "brick.png");
f->type = CMT_STONE; f->type = CMT_STONE;
f->hardness = 1.0; f->hardness = 1.0;
f->onpunch_replace_node = CONTENT_BRICK_INNER_STAIR_CORNER; f->onpunch_replace_node = CONTENT_BRICK_INNER_STAIR_CORNER;
@ -638,19 +634,15 @@ void content_mapnode_stair(bool repeat)
f = &content_features(i); f = &content_features(i);
f->param_type = CPT_FACEDIR_SIMPLE; f->param_type = CPT_FACEDIR_SIMPLE;
f->rotate_tile_with_nodebox = true; f->rotate_tile_with_nodebox = true;
f->setTexture(0,"brick_bottom.png"); f->setAllTextures("brick.png");
f->setTexture(1,"brick_stair_ud_corner_top.png"); f->setTexture(1,"brick_bottom.png");
f->setTexture(2,"brick_stair_ud_corner_front_2.png");
f->setTexture(3,"brick_stair_ud_corner_front_3.png");
f->setTexture(4,"brick_stair_ud_corner_front_4.png");
f->setTexture(5,"brick_stair_ud_corner_front_5.png");
f->draw_type = CDT_NODEBOX; f->draw_type = CDT_NODEBOX;
f->is_ground_content = true; f->is_ground_content = true;
f->dug_item = std::string("CraftItem clay_brick 24"); f->dug_item = std::string("CraftItem clay_brick 24");
content_nodebox_stair_cornerud(f); content_nodebox_stair_cornerud(f);
f->setInventoryTextureNodeBox(i,"brick_stair_corner_top.png", f->setInventoryTextureNodeBox(i,"brick.png",
"brick_stair_ud_corner_front_5.png", "brick.png",
"brick_stair_ud_corner_front_2.png"); "brick.png");
f->type = CMT_STONE; f->type = CMT_STONE;
f->hardness = 1.0; f->hardness = 1.0;
f->onpunch_replace_node = CONTENT_BRICK_INNER_STAIR_CORNER_UD; f->onpunch_replace_node = CONTENT_BRICK_INNER_STAIR_CORNER_UD;