diff options
| author | madmaxoft@gmail.com <madmaxoft@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6> | 2013-05-19 20:41:16 +0200 |
|---|---|---|
| committer | madmaxoft@gmail.com <madmaxoft@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6> | 2013-05-19 20:41:16 +0200 |
| commit | 5d3ade02671cef162c3fdfd20fc7aaf760de0505 (patch) | |
| tree | 145fc70294eb169a101bbe1354dc74df6089ba6a /source | |
| parent | Debuggers: a simple test of armor slot setting (diff) | |
| download | cuberite-5d3ade02671cef162c3fdfd20fc7aaf760de0505.tar cuberite-5d3ade02671cef162c3fdfd20fc7aaf760de0505.tar.gz cuberite-5d3ade02671cef162c3fdfd20fc7aaf760de0505.tar.bz2 cuberite-5d3ade02671cef162c3fdfd20fc7aaf760de0505.tar.lz cuberite-5d3ade02671cef162c3fdfd20fc7aaf760de0505.tar.xz cuberite-5d3ade02671cef162c3fdfd20fc7aaf760de0505.tar.zst cuberite-5d3ade02671cef162c3fdfd20fc7aaf760de0505.zip | |
Diffstat (limited to '')
| -rw-r--r-- | source/BlockID.h | 39 | ||||
| -rw-r--r-- | source/Inventory.cpp | 2 |
2 files changed, 18 insertions, 23 deletions
diff --git a/source/BlockID.h b/source/BlockID.h index c567644c9..c61906701 100644 --- a/source/BlockID.h +++ b/source/BlockID.h @@ -401,22 +401,22 @@ enum E_META_SANDSTONE_SMOOTH = 2, // E_BLOCK_WOOL metas: - E_META_WOOL_WHITE = 0, - E_META_WOOL_ORANGE = 1, - E_META_WOOL_MAGENTA = 2, - E_META_WOOL_LIGHTBLUE = 3, - E_META_WOOL_YELLOW = 4, + E_META_WOOL_WHITE = 0, + E_META_WOOL_ORANGE = 1, + E_META_WOOL_MAGENTA = 2, + E_META_WOOL_LIGHTBLUE = 3, + E_META_WOOL_YELLOW = 4, E_META_WOOL_LIGHTGREEN = 5, - E_META_WOOL_PINK = 6, - E_META_WOOL_GRAY = 7, - E_META_WOOL_LIGHTGRAY = 8, - E_META_WOOL_CYAN = 9, - E_META_WOOL_PURPLE = 10, - E_META_WOOL_BLUE = 11, - E_META_WOOL_BROWN = 12, - E_META_WOOL_GREEN = 13, - E_META_WOOL_RED = 14, - E_META_WOOL_BLACK = 15, + E_META_WOOL_PINK = 6, + E_META_WOOL_GRAY = 7, + E_META_WOOL_LIGHTGRAY = 8, + E_META_WOOL_CYAN = 9, + E_META_WOOL_PURPLE = 10, + E_META_WOOL_BLUE = 11, + E_META_WOOL_BROWN = 12, + E_META_WOOL_GREEN = 13, + E_META_WOOL_RED = 14, + E_META_WOOL_BLACK = 15, // E_BLOCK_TORCH, E_BLOCK_REDSTONE_TORCH_OFF, E_BLOCK_REDSTONE_TORCH_ON metas: E_META_TORCH_EAST = 1, // east face of the block, pointing east @@ -476,15 +476,8 @@ enum E_BLOCK_WOODEN_STEP_APPLE = 0, E_BLOCK_WOODEN_STEP_CONIFER = 1, E_BLOCK_WOODEN_STEP_BIRCH = 2, - E_BLOCK_WOODEN_STEP_JUNGLE = 3 -} ; - - - + E_BLOCK_WOODEN_STEP_JUNGLE = 3, - -enum -{ // E_ITEM_COAL metas: E_META_COAL_NORMAL = 0, E_META_COAL_CHARCOAL = 1, diff --git a/source/Inventory.cpp b/source/Inventory.cpp index 7cfe69be8..8591b7dc2 100644 --- a/source/Inventory.cpp +++ b/source/Inventory.cpp @@ -197,6 +197,8 @@ void cInventory::SetSlot(int a_SlotNum, const cItem & a_Item) { m_Owner.GetWorld()->BroadcastEntityEquipment(m_Owner, SlotNumToEntityEquipmentID(a_SlotNum), a_Item, m_Owner.GetClientHandle()); } + + SendSlot(a_SlotNum); } |