oerkki/voxelands
oerkki
/
voxelands
2
1
Fork 1
Code Issues 19 Pull Requests Releases Activity

fix flag wield item / inventory texture

This commit is contained in:
darkrose 2015-06-07 00:53:12 +10:00
parent 24abc056c6
commit ec2cdce98d
10 changed files with 0 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
data/textures/flag.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 313 B

After

Width:  |  Height:  |  Size: 316 B

BIN
data/textures/flag_black.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 309 B

After

Width:  |  Height:  |  Size: 313 B

BIN
data/textures/flag_blue.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 302 B

After

Width:  |  Height:  |  Size: 307 B

BIN
data/textures/flag_green.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 311 B

After

Width:  |  Height:  |  Size: 315 B

BIN
data/textures/flag_orange.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 315 B

After

Width:  |  Height:  |  Size: 316 B

BIN
data/textures/flag_purple.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 318 B

After

Width:  |  Height:  |  Size: 323 B

BIN
data/textures/flag_red.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 303 B

After

Width:  |  Height:  |  Size: 307 B

BIN
data/textures/flag_yellow.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 310 B

After

Width:  |  Height:  |  Size: 316 B

8
src/content_mapnode_special.cpp
View File

@ -1695,7 +1695,6 @@ void content_mapnode_special(bool repeat)
f->solidness = 0; // drawn separately, makes no faces
f->air_equivalent = true; // grass grows underneath
content_nodebox_flag(f);
f->setInventoryTextureNodeBox(i,"flag.png","flag.png","flag_end.png");
f->home_node = PLAYERFLAG_WHITE;
f->type = CMT_WOOD;
f->hardness = 0.4;
@ -1742,7 +1741,6 @@ void content_mapnode_special(bool repeat)
f->solidness = 0; // drawn separately, makes no faces
f->air_equivalent = true; // grass grows underneath
content_nodebox_flag(f);
f->setInventoryTextureNodeBox(i,"flag_blue.png","flag_blue.png","flag_blue_end.png");
f->home_node = PLAYERFLAG_BLUE;
f->type = CMT_WOOD;
f->hardness = 0.4;
@ -1768,7 +1766,6 @@ void content_mapnode_special(bool repeat)
f->solidness = 0; // drawn separately, makes no faces
f->air_equivalent = true; // grass grows underneath
content_nodebox_flag(f);
f->setInventoryTextureNodeBox(i,"flag_green.png","flag_green.png","flag_green_end.png");
f->home_node = PLAYERFLAG_GREEN;
f->type = CMT_WOOD;
f->hardness = 0.4;
@ -1794,7 +1791,6 @@ void content_mapnode_special(bool repeat)
f->solidness = 0; // drawn separately, makes no faces
f->air_equivalent = true; // grass grows underneath
content_nodebox_flag(f);
f->setInventoryTextureNodeBox(i,"flag_orange.png","flag_orange.png","flag_orange_end.png");
f->home_node = PLAYERFLAG_ORANGE;
f->type = CMT_WOOD;
f->hardness = 0.4;
@ -1820,7 +1816,6 @@ void content_mapnode_special(bool repeat)
f->solidness = 0; // drawn separately, makes no faces
f->air_equivalent = true; // grass grows underneath
content_nodebox_flag(f);
f->setInventoryTextureNodeBox(i,"flag_purple.png","flag_purple.png","flag_purple_end.png");
f->home_node = PLAYERFLAG_PURPLE;
f->type = CMT_WOOD;
f->hardness = 0.4;
@ -1846,7 +1841,6 @@ void content_mapnode_special(bool repeat)
f->solidness = 0; // drawn separately, makes no faces
f->air_equivalent = true; // grass grows underneath
content_nodebox_flag(f);
f->setInventoryTextureNodeBox(i,"flag_red.png","flag_red.png","flag_red_end.png");
f->home_node = PLAYERFLAG_RED;
f->type = CMT_WOOD;
f->hardness = 0.4;
@ -1872,7 +1866,6 @@ void content_mapnode_special(bool repeat)
f->solidness = 0; // drawn separately, makes no faces
f->air_equivalent = true; // grass grows underneath
content_nodebox_flag(f);
f->setInventoryTextureNodeBox(i,"flag_yellow.png","flag_yellow.png","flag_yellow_end.png");
f->home_node = PLAYERFLAG_YELLOW;
f->type = CMT_WOOD;
f->hardness = 0.4;
@ -1898,7 +1891,6 @@ void content_mapnode_special(bool repeat)
f->solidness = 0; // drawn separately, makes no faces
f->air_equivalent = true; // grass grows underneath
content_nodebox_flag(f);
f->setInventoryTextureNodeBox(i,"flag_black.png","flag_black.png","flag_black_end.png");
f->home_node = PLAYERFLAG_BLACK;
f->type = CMT_WOOD;
f->hardness = 0.4;

6
src/content_nodebox.cpp
View File

@ -1451,12 +1451,6 @@ void content_nodebox_flag(ContentFeatures *f)
f->setNodeBox(NodeBox(
-0.125*BS,-0.5*BS,-0.125*BS,0.125*BS,0.5*BS,0.125*BS
));
//f->setNodeBox(NodeBox(
//-0.4375*BS,-0.5*BS,-0.1875*BS,-0.25*BS,0.5*BS,0.*BS
//));
//f->addNodeBox(NodeBox(
//-0.25*BS,0.*BS,-0.125*BS,0.4375*BS,0.4375*BS,-0.0625*BS
//));
}
void content_nodebox_flower_pot(ContentFeatures *f)