diff options
| author | Howaner <franzi.moos@googlemail.com> | 2014-11-29 12:05:35 +0100 |
|---|---|---|
| committer | Howaner <franzi.moos@googlemail.com> | 2014-11-29 12:05:35 +0100 |
| commit | 648fee1a087cb97da9a4646d72ffc590e7837a67 (patch) | |
| tree | eb55b68428a303089bc1120e9c3593542059f18e /src/BlockID.h | |
| parent | Finished mob spawner implementation. (diff) | |
| parent | Merge pull request #1619 from mc-server/WarningFixes (diff) | |
| download | cuberite-648fee1a087cb97da9a4646d72ffc590e7837a67.tar cuberite-648fee1a087cb97da9a4646d72ffc590e7837a67.tar.gz cuberite-648fee1a087cb97da9a4646d72ffc590e7837a67.tar.bz2 cuberite-648fee1a087cb97da9a4646d72ffc590e7837a67.tar.lz cuberite-648fee1a087cb97da9a4646d72ffc590e7837a67.tar.xz cuberite-648fee1a087cb97da9a4646d72ffc590e7837a67.tar.zst cuberite-648fee1a087cb97da9a4646d72ffc590e7837a67.zip | |
Diffstat (limited to 'src/BlockID.h')
| -rw-r--r-- | src/BlockID.h | 2 |
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); |