diff options
| author | madmaxoft@gmail.com <madmaxoft@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6> | 2012-08-06 12:36:20 +0200 |
|---|---|---|
| committer | madmaxoft@gmail.com <madmaxoft@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6> | 2012-08-06 12:36:20 +0200 |
| commit | 323612e5c0bb5e6f7bf680c14f0340a71ee8c977 (patch) | |
| tree | 622ea91585602089968f0cdecd1255d27e7f4183 | |
| parent | GNUmakefile: Split the debug build into debug and pedantic; more comments; added O3 optimization to external C libraries even in debug mode (diff) | |
| download | cuberite-323612e5c0bb5e6f7bf680c14f0340a71ee8c977.tar cuberite-323612e5c0bb5e6f7bf680c14f0340a71ee8c977.tar.gz cuberite-323612e5c0bb5e6f7bf680c14f0340a71ee8c977.tar.bz2 cuberite-323612e5c0bb5e6f7bf680c14f0340a71ee8c977.tar.lz cuberite-323612e5c0bb5e6f7bf680c14f0340a71ee8c977.tar.xz cuberite-323612e5c0bb5e6f7bf680c14f0340a71ee8c977.tar.zst cuberite-323612e5c0bb5e6f7bf680c14f0340a71ee8c977.zip | |
| -rw-r--r-- | source/blocks/Block.cpp | 2 | ||||
| -rw-r--r-- | source/blocks/Block.h | 2 | ||||
| -rw-r--r-- | source/blocks/BlockOre.h | 2 | ||||
| -rw-r--r-- | source/items/ItemPickaxe.h | 4 |
4 files changed, 5 insertions, 5 deletions
diff --git a/source/blocks/Block.cpp b/source/blocks/Block.cpp index 0df3e8374..215a6c618 100644 --- a/source/blocks/Block.cpp +++ b/source/blocks/Block.cpp @@ -148,7 +148,7 @@ cBlockHandler *cBlockHandler::CreateBlockHandler(BLOCKTYPE a_BlockID) case E_BLOCK_GOLD_ORE:
case E_BLOCK_REDSTONE_ORE:
case E_BLOCK_REDSTONE_ORE_GLOWING:
- case (char)E_BLOCK_EMERALD_ORE:
+ case E_BLOCK_EMERALD_ORE:
case E_BLOCK_IRON_ORE:
case E_BLOCK_LAPIS_ORE:
case E_BLOCK_COAL_ORE:
diff --git a/source/blocks/Block.h b/source/blocks/Block.h index e35856459..0a5724ca3 100644 --- a/source/blocks/Block.h +++ b/source/blocks/Block.h @@ -46,7 +46,7 @@ public: static void Deinit();
protected:
- char m_BlockID;
+ BLOCKTYPE m_BlockID;
static cBlockHandler *CreateBlockHandler(BLOCKTYPE a_BlockID);
static cBlockHandler *m_BlockHandler[256];
static bool m_HandlerInitialized; //used to detect if the blockhandlers are initialized
diff --git a/source/blocks/BlockOre.h b/source/blocks/BlockOre.h index 1230f72e8..4788c9b89 100644 --- a/source/blocks/BlockOre.h +++ b/source/blocks/BlockOre.h @@ -46,7 +46,7 @@ public: case E_BLOCK_REDSTONE_ORE:
case E_BLOCK_REDSTONE_ORE_GLOWING:
return E_ITEM_REDSTONE_DUST;
- case (char)E_BLOCK_EMERALD_ORE:
+ case E_BLOCK_EMERALD_ORE:
return E_ITEM_EMERALD;
case E_BLOCK_LAPIS_ORE:
return E_ITEM_DYE;
diff --git a/source/items/ItemPickaxe.h b/source/items/ItemPickaxe.h index f1800c7be..a179d154f 100644 --- a/source/items/ItemPickaxe.h +++ b/source/items/ItemPickaxe.h @@ -42,7 +42,7 @@ public: case E_BLOCK_GOLD_ORE:
case E_BLOCK_REDSTONE_ORE:
case E_BLOCK_REDSTONE_ORE_GLOWING:
- case (char)E_BLOCK_EMERALD_ORE:
+ case E_BLOCK_EMERALD_ORE:
return PickaxeLevel() >= 3;
case E_BLOCK_IRON_BLOCK:
case E_BLOCK_IRON_ORE:
@@ -54,7 +54,7 @@ public: case E_BLOCK_COBBLESTONE:
case E_BLOCK_END_STONE:
case E_BLOCK_MOSSY_COBBLESTONE:
- case (char)E_BLOCK_SANDSTONE_STAIRS:
+ case E_BLOCK_SANDSTONE_STAIRS:
case E_BLOCK_SANDSTONE:
case E_BLOCK_STONE_BRICKS:
case E_BLOCK_NETHER_BRICK:
|