flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

BLOCKTYPE signedness change - fixed more details

Browse Source 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@713 0a769ca7-a7f5-676a-18bf-c427514a06d6
This commit is contained in:
madmaxoft@gmail.com 2012-08-06 10:36:20 +00:00
parent 296237289e
commit 323612e5c0
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/blocks/Block.cpp
View File

@ -148,7 +148,7 @@ cBlockHandler *cBlockHandler::CreateBlockHandler(BLOCKTYPE a_BlockID)
case E_BLOCK_GOLD_ORE: case E_BLOCK_GOLD_ORE:
case E_BLOCK_REDSTONE_ORE: case E_BLOCK_REDSTONE_ORE:
case E_BLOCK_REDSTONE_ORE_GLOWING: 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_IRON_ORE:
case E_BLOCK_LAPIS_ORE: case E_BLOCK_LAPIS_ORE:
case E_BLOCK_COAL_ORE: case E_BLOCK_COAL_ORE:

2
source/blocks/Block.h
View File

@ -46,7 +46,7 @@ public:
static void Deinit(); static void Deinit();
protected: protected:
char m_BlockID; BLOCKTYPE m_BlockID;
static cBlockHandler *CreateBlockHandler(BLOCKTYPE a_BlockID); static cBlockHandler *CreateBlockHandler(BLOCKTYPE a_BlockID);
static cBlockHandler *m_BlockHandler[256]; static cBlockHandler *m_BlockHandler[256];
static bool m_HandlerInitialized; //used to detect if the blockhandlers are initialized static bool m_HandlerInitialized; //used to detect if the blockhandlers are initialized

2
source/blocks/BlockOre.h
View File

@ -46,7 +46,7 @@ public:
case E_BLOCK_REDSTONE_ORE: case E_BLOCK_REDSTONE_ORE:
case E_BLOCK_REDSTONE_ORE_GLOWING: case E_BLOCK_REDSTONE_ORE_GLOWING:
return E_ITEM_REDSTONE_DUST; return E_ITEM_REDSTONE_DUST;
case (char)E_BLOCK_EMERALD_ORE: case E_BLOCK_EMERALD_ORE:
return E_ITEM_EMERALD; return E_ITEM_EMERALD;
case E_BLOCK_LAPIS_ORE: case E_BLOCK_LAPIS_ORE:
return E_ITEM_DYE; return E_ITEM_DYE;

4
source/items/ItemPickaxe.h
View File

@ -42,7 +42,7 @@ public:
case E_BLOCK_GOLD_ORE: case E_BLOCK_GOLD_ORE:
case E_BLOCK_REDSTONE_ORE: case E_BLOCK_REDSTONE_ORE:
case E_BLOCK_REDSTONE_ORE_GLOWING: case E_BLOCK_REDSTONE_ORE_GLOWING:
case (char)E_BLOCK_EMERALD_ORE: case E_BLOCK_EMERALD_ORE:
return PickaxeLevel() >= 3; return PickaxeLevel() >= 3;
case E_BLOCK_IRON_BLOCK: case E_BLOCK_IRON_BLOCK:
case E_BLOCK_IRON_ORE: case E_BLOCK_IRON_ORE:
@ -54,7 +54,7 @@ public:
case E_BLOCK_COBBLESTONE: case E_BLOCK_COBBLESTONE:
case E_BLOCK_END_STONE: case E_BLOCK_END_STONE:
case E_BLOCK_MOSSY_COBBLESTONE: case E_BLOCK_MOSSY_COBBLESTONE:
case (char)E_BLOCK_SANDSTONE_STAIRS: case E_BLOCK_SANDSTONE_STAIRS:
case E_BLOCK_SANDSTONE: case E_BLOCK_SANDSTONE:
case E_BLOCK_STONE_BRICKS: case E_BLOCK_STONE_BRICKS:
case E_BLOCK_NETHER_BRICK: case E_BLOCK_NETHER_BRICK: