summaryrefslogtreecommitdiffstats
path: root/source/BlockID.h
diff options
context:
space:
mode:
authormadmaxoft@gmail.com <madmaxoft@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6>2012-09-08 18:08:29 +0200
committermadmaxoft@gmail.com <madmaxoft@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6>2012-09-08 18:08:29 +0200
commit8c43857b739566be1e59d61aec192ef63e77cbb1 (patch)
tree7b69b805537c776fd7620cf5cba539e32f01fef5 /source/BlockID.h
parentRelaxed the check for held item, the client sometimes sends wrong ItemType. (diff)
downloadcuberite-8c43857b739566be1e59d61aec192ef63e77cbb1.tar
cuberite-8c43857b739566be1e59d61aec192ef63e77cbb1.tar.gz
cuberite-8c43857b739566be1e59d61aec192ef63e77cbb1.tar.bz2
cuberite-8c43857b739566be1e59d61aec192ef63e77cbb1.tar.lz
cuberite-8c43857b739566be1e59d61aec192ef63e77cbb1.tar.xz
cuberite-8c43857b739566be1e59d61aec192ef63e77cbb1.tar.zst
cuberite-8c43857b739566be1e59d61aec192ef63e77cbb1.zip
Diffstat (limited to 'source/BlockID.h')
-rw-r--r--source/BlockID.h8
1 files changed, 7 insertions, 1 deletions
diff --git a/source/BlockID.h b/source/BlockID.h
index a66e7f026..5833a6d1d 100644
--- a/source/BlockID.h
+++ b/source/BlockID.h
@@ -631,6 +631,12 @@ extern BLOCKTYPE BlockStringToType(const AString & a_BlockTypeString); // tolua
/// Translates an itemtype string into an item. Takes either a number, number^number, number:number or an items.ini alias as input. Returns true if successful.
extern bool StringToItem(const AString & a_ItemTypeString, cItem & a_Item); // tolua_export
+/// Translates a full item into a string. If the ItemType is not recognized, the ItemType number is output into the string.
+extern AString ItemToString(const cItem & a_Item); // tolua_export
+
+/// Translates itemtype into a string. If the type is not recognized, the itemtype number is output into the string.
+extern AString ItemTypeToString(short a_ItemType); // tolua_export
+
/// Translates a biome string to biome enum. Takes either a number or a biome alias (built-in). Returns -1 on failure.
extern EMCSBiome StringToBiome(const AString & a_BiomeString);
@@ -645,7 +651,7 @@ extern bool g_BlockTransparent[256];
extern bool g_BlockOneHitDig[256];
extern bool g_BlockPistonBreakable[256];
extern bool g_BlockIsSnowable[256];
-extern bool g_BlockRequiresSpecialTool[256];
+extern bool g_BlockRequiresSpecialTool[256];