+ brick

diff --git a/data/brick.png b/data/brick.png
new file mode 100644 (file)
index 0000000..32d77f3
Binary files /dev/null and b/data/brick.png differ

diff --git a/src/mapnode.cpp b/src/mapnode.cpp
index cfb1a493fbd0d7e74f1bea9f2e216cec2e395511..72cd762c67edb228ab6b6afebf99718f18781b5a 100644 (file)
--- a/src/mapnode.cpp
+++ b/src/mapnode.cpp
@@ -189,6 +189,14 @@ void init_mapnode()
        f->is_ground_content = true;
        f->dug_item = std::string("MaterialItem ")+itos(CONTENT_SAND)+" 1";
        
+       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("MaterialItem ")+itos(i)+" 1";
+       
        i = CONTENT_TREE;
        f = &g_content_features[i];
        f->setAllTextures("tree.png");

diff --git a/src/mapnode.h b/src/mapnode.h
index c4dcbfbe500a6daabddc8dfc7f2abead36db228c..5022031de4fdfd941911b3316f16c4a75805d58a 100644 (file)
--- a/src/mapnode.h
+++ b/src/mapnode.h
@@ -103,6 +103,7 @@ void init_content_inventory_texture_paths();
 #define CONTENT_FENCE 21
 #define CONTENT_SANDSTONE 22
 #define CONTENT_CACTUS 23
+#define CONTENT_BRICK 24
 
 /*
        Content feature list

diff --git a/src/materials.cpp b/src/materials.cpp
index a1d419562d47089e9b9c056000f44161c7856bf9..0c744af9f0c0c33e32f629e45ddbf1f6ad04d162 100644 (file)
--- a/src/materials.cpp
+++ b/src/materials.cpp
@@ -60,6 +60,7 @@ void initializeMaterialProperties()
 
        setStoneLikeDiggingProperties(CONTENT_STONE, 1.0);
        setStoneLikeDiggingProperties(CONTENT_SANDSTONE, 1.0);
+       setStoneLikeDiggingProperties(CONTENT_BRICK, 3.0);
        setStoneLikeDiggingProperties(CONTENT_MESE, 0.5);
        setStoneLikeDiggingProperties(CONTENT_COALSTONE, 1.5);
        setStoneLikeDiggingProperties(CONTENT_FURNACE, 3.0);

diff --git a/src/server.cpp b/src/server.cpp
index 994e62eaf63a63e6304141bac2d8747c354c3d32..dfc05f7d3b4275d6b280a71df6c6e7fe4effea52 100644 (file)
--- a/src/server.cpp
+++ b/src/server.cpp
@@ -4076,6 +4076,7 @@ void setCreativeInventory(Player *player)
                CONTENT_STONE,
                CONTENT_SAND,
                CONTENT_SANDSTONE,
+               CONTENT_BRICK,
                CONTENT_TREE,
                CONTENT_LEAVES,
                CONTENT_CACTUS,

diff --git a/src/tile.cpp b/src/tile.cpp
index 2a2d2a70c0b57f35727bcc6c6a35c95b184199af..361de704cce344eca36e599bdb554b92ca9d541a 100644 (file)
--- a/src/tile.cpp
+++ b/src/tile.cpp
@@ -507,6 +507,7 @@ void TextureSource::buildMainAtlas()
        sourcelist.push_back("mud.png");
        sourcelist.push_back("sand.png");
        sourcelist.push_back("sandstone.png");
+       sourcelist.push_back("brick.png");
        sourcelist.push_back("grass.png");
        sourcelist.push_back("grass_footsteps.png");
        sourcelist.push_back("tree.png");