From d7b768dc4b94786474c35a6ae7ea2000d7e11626 Mon Sep 17 00:00:00 2001
From: Nils Dagsson Moskopp <nils@dieweltistgarnichtso.net>
Date: Tue, 31 May 2011 22:04:09 +0200
Subject: [PATCH] + brick
---
data/brick.png | Bin 0 -> 604 bytes
src/mapnode.cpp | 8 ++++++++
src/mapnode.h | 1 +
src/materials.cpp | 1 +
src/server.cpp | 1 +
src/tile.cpp | 1 +
6 files changed, 12 insertions(+)
create mode 100644 data/brick.png
diff --git a/data/brick.png b/data/brick.png
new file mode 100644
index 0000000000000000000000000000000000000000..32d77f34787b079f9df729bc398b780be98e83b1
GIT binary patch
literal 604
zcmV-i0;BzjP)<h;3K|Lk000e1NJLTq000mG000mO0ssI2kdbIM00001b5ch_0Itp)
z=>Px#32;bRa{vGi!~g&e!~vBn4jTXf00(qQO+^RW1snq+G7BMy;s5{v?ny*JR4C6i
z(o1g}WdMcYXD;@5E{@YwP1=eLv?)kz5GorgemW}@ghaRrsvuAmk;-wC#*r`a*q$#l
zVG%_-tFwB~s}r5DWX$2;zh8av)d77l0}Xrc-qtU^j98MB&WI@4-+!{9CZeUsiY-mk
z)MTI}%_$ggcJ_WtkIRQ9VUK!MH)P~o6aDe_mwwh?E|yuA#c|y4_v1KTE|$H1FN&hJ
zZ9@n}QFL905JL1lBW~$EBw_mV5BWFW#k}V^EfFg|Ir}Frxu<GqIcGstRWo*YOkhn-
z$six3DPx8t<dmT6x?QeF*)pPIm+93s`uFrCgfJeTKYe;IpUnsPpePF5+}wl^P*v4v
zG@48%FArZ{e7J~yqM#-G`eXd{w^&nfN5w6x<D>NTn;|nUNCPb`d7e)x$Z2@Qf@=nw
z4H8O5q%j?HhU+y7u6fQ4JxZ$44lW-AMt`3CmiE%=$LVlqm?TME*Kr(YS(X?1X1$qA
zKD_$;5Yvy--AB81T}OYhCE=2U0WI0_QS$l?p7D;)_>UEzo}Q#Bfh7qCME9S|`Wpfh
z9&<%OMp>2dgg$#<%aj>+-QAYK{WcKsjPvn%S{xtURb{hnUhO}b&1PxWEf>oW!i&l2
qaA!E5&u?$rtl4hXo9i^~b>06UK-MLJs6x^J0000<MNUMnLSTabJ_>^X
literal 0
HcmV?d00001
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");
--
GitLab