summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--data/brick.pngbin0 -> 604 bytes
-rw-r--r--src/mapnode.cpp8
-rw-r--r--src/mapnode.h1
-rw-r--r--src/materials.cpp1
-rw-r--r--src/server.cpp1
-rw-r--r--src/tile.cpp1
6 files changed, 12 insertions, 0 deletions
diff --git a/data/brick.png b/data/brick.png
new file mode 100644
index 000000000..32d77f347
--- /dev/null
+++ b/data/brick.png
Binary files differ
diff --git a/src/mapnode.cpp b/src/mapnode.cpp
index cfb1a493f..72cd762c6 100644
--- 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 c4dcbfbe5..5022031de 100644
--- 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 a1d419562..0c744af9f 100644
--- 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 994e62eaf..dfc05f7d3 100644
--- 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 2a2d2a70c..361de704c 100644
--- 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");