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

darkrose amusing herself

This commit is contained in:
darkrose 2015-03-19 17:22:09 +10:00
parent 8521a207a9
commit 36f7fd7400
2 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/content_mapnode_furniture.cpp
View File

@ -1041,23 +1041,23 @@ void content_mapnode_furniture(bool repeat)
f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1"; f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1";
f->flammable = 1; // can be replaced by fire if the node under it is set on fire f->flammable = 1; // can be replaced by fire if the node under it is set on fire
f->fuel_time = 30/32; f->fuel_time = 30/32;
f->setNodeBox(core::aabbox3d<f32>( f->setNodeBox(NodeBox(
-0.3*BS, -0.5*BS, 0.20*BS, -0.2*BS, 0.5*BS, 0.30*BS v3s16(0,1,0),v3f(0,0,0),-0.3*BS, -0.5*BS, 0.20*BS, -0.2*BS, 0.5*BS, 0.30*BS
)); ));
f->addNodeBox(core::aabbox3d<f32>( f->addNodeBox(NodeBox(
0.2*BS, -0.5*BS, 0.20*BS, 0.3*BS, 0.5*BS, 0.30*BS v3s16(0,1,0),v3f(0,0,0),0.2*BS, -0.5*BS, 0.20*BS, 0.3*BS, 0.5*BS, 0.30*BS
)); ));
f->addNodeBox(core::aabbox3d<f32>( f->addNodeBox(NodeBox(
-0.3*BS, -0.5*BS, -0.30*BS, -0.2*BS, -0.1*BS, -0.20*BS v3s16(0,1,0),v3f(0,0,0),-0.3*BS, -0.5*BS, -0.30*BS, -0.2*BS, -0.1*BS, -0.20*BS
)); ));
f->addNodeBox(core::aabbox3d<f32>( f->addNodeBox(NodeBox(
0.2*BS, -0.5*BS, -0.30*BS, 0.3*BS, -0.1*BS, -0.20*BS v3s16(0,1,0),v3f(0,0,0),0.2*BS, -0.5*BS, -0.30*BS, 0.3*BS, -0.1*BS, -0.20*BS
)); ));
f->addNodeBox(core::aabbox3d<f32>( f->addNodeBox(NodeBox(
-0.3*BS, -0.1*BS, -0.30*BS, 0.3*BS, 0.0*BS, 0.20*BS v3s16(0,1,0),v3f(0,0,0),-0.3*BS, -0.1*BS, -0.30*BS, 0.3*BS, 0.0*BS, 0.20*BS
)); ));
f->addNodeBox(core::aabbox3d<f32>( f->addNodeBox(NodeBox(
-0.2*BS, 0.1*BS, 0.25*BS, 0.2*BS, 0.4*BS, 0.26*BS v3s16(0,1,0),v3f(0,0,0),-0.2*BS, 0.1*BS, 0.25*BS, 0.2*BS, 0.4*BS, 0.26*BS
)); ));
f->setInventoryTextureNodeBox(i,"pine.png", "pine.png", "pine.png"); f->setInventoryTextureNodeBox(i,"pine.png", "pine.png", "pine.png");
f->type = CMT_WOOD; f->type = CMT_WOOD;

11
src/content_nodebox.cpp
View File

@ -714,6 +714,7 @@ void content_nodebox_guide(ContentFeatures *f)
void content_nodebox_painting(ContentFeatures *f) void content_nodebox_painting(ContentFeatures *f)
{ {
f->setNodeBox(NodeBox( f->setNodeBox(NodeBox(
v3s16(0,0,1),v3f(0,0,0),
-0.4375*BS, -0.4375*BS,
-0.375*BS, -0.375*BS,
0.4375*BS, 0.4375*BS,
@ -1458,19 +1459,19 @@ void content_nodebox_flag(ContentFeatures *f)
void content_nodebox_flower_pot(ContentFeatures *f) void content_nodebox_flower_pot(ContentFeatures *f)
{ {
f->setNodeBox(NodeBox( f->setNodeBox(NodeBox(
-0.3125*BS,-0.5*BS,-0.3125*BS,0.3125*BS,0.25*BS,0.3125*BS v3s16(0,-1,0),v3f(0,0,0),-0.3125*BS,-0.5*BS,-0.3125*BS,0.3125*BS,0.25*BS,0.3125*BS
)); ));
f->addNodeBox(NodeBox( f->addNodeBox(NodeBox(
-0.375*BS,0.125*BS,-0.375*BS,-0.3125*BS,0.375*BS,0.375*BS v3s16(0,-1,0),v3f(0,0,0),-0.375*BS,0.125*BS,-0.375*BS,-0.3125*BS,0.375*BS,0.375*BS
)); ));
f->addNodeBox(NodeBox( f->addNodeBox(NodeBox(
0.3125*BS,0.125*BS,-0.375*BS,0.375*BS,0.375*BS,0.375*BS v3s16(0,-1,0),v3f(0,0,0),0.3125*BS,0.125*BS,-0.375*BS,0.375*BS,0.375*BS,0.375*BS
)); ));
f->addNodeBox(NodeBox( f->addNodeBox(NodeBox(
-0.3125*BS,0.125*BS,-0.375*BS,0.3125*BS,0.375*BS,-0.3125*BS v3s16(0,-1,0),v3f(0,0,0),-0.3125*BS,0.125*BS,-0.375*BS,0.3125*BS,0.375*BS,-0.3125*BS
)); ));
f->addNodeBox(NodeBox( f->addNodeBox(NodeBox(
-0.3125*BS,0.125*BS,0.3125*BS,0.3125*BS,0.375*BS,0.375*BS v3s16(0,-1,0),v3f(0,0,0),-0.3125*BS,0.125*BS,0.3125*BS,0.3125*BS,0.375*BS,0.375*BS
)); ));
} }