summaryrefslogtreecommitdiffstats
path: root/src/BlockID.h
diff options
context:
space:
mode:
authorMattes D <github@xoft.cz>2014-11-28 22:46:58 +0100
committerMattes D <github@xoft.cz>2014-11-28 22:46:58 +0100
commit883230abbcc20a4a27e1d8909894be63dee75d43 (patch)
treeecbdc082281e820fc98a302add93400ba467dbd7 /src/BlockID.h
parentCMake: Fixed linux builds. (diff)
parentChunk: Fixed same-name iterators. (diff)
downloadcuberite-883230abbcc20a4a27e1d8909894be63dee75d43.tar
cuberite-883230abbcc20a4a27e1d8909894be63dee75d43.tar.gz
cuberite-883230abbcc20a4a27e1d8909894be63dee75d43.tar.bz2
cuberite-883230abbcc20a4a27e1d8909894be63dee75d43.tar.lz
cuberite-883230abbcc20a4a27e1d8909894be63dee75d43.tar.xz
cuberite-883230abbcc20a4a27e1d8909894be63dee75d43.tar.zst
cuberite-883230abbcc20a4a27e1d8909894be63dee75d43.zip
Diffstat (limited to 'src/BlockID.h')
-rw-r--r--src/BlockID.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/BlockID.h b/src/BlockID.h
index 24de2dc8a..8f2cee02e 100644
--- a/src/BlockID.h
+++ b/src/BlockID.h
@@ -1096,7 +1096,7 @@ class cIniFile;
// tolua_begin
/// Translates a blocktype string into blocktype. Takes either a number or an items.ini alias as input. Returns -1 on failure.
-extern BLOCKTYPE BlockStringToType(const AString & a_BlockTypeString);
+extern int BlockStringToType(const AString & a_BlockTypeString);
/// 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);