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

Merge remote-tracking branch 'origin/master' into saplingsandleaves

Browse Source 
Conflicts:
	src/Defines.h
This commit is contained in:
Tiger Wang
2014-07-22 18:30:31 +01:00
parent d0e7b2f18b 31b22e14b7
commit 18a0b60c12
111 changed files with 1092 additions and 935 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Items/ItemFood.h
View File

@@ -26,7 +26,7 @@ public:
virtual FoodInfo GetFoodInfo(void) override
{
switch(m_ItemType)
switch (m_ItemType)
{
// Please keep alpha-sorted.
case E_ITEM_BAKED_POTATO: return FoodInfo(6, 7.2);

4
src/Items/ItemHandler.cpp
View File

@@ -94,7 +94,7 @@ cItemHandler * cItemHandler::GetItemHandler(int a_ItemType)
cItemHandler *cItemHandler::CreateItemHandler(int a_ItemType)
{
switch(a_ItemType)
switch (a_ItemType)
{
default: return new cItemHandler(a_ItemType);
@@ -263,7 +263,7 @@ cItemHandler *cItemHandler::CreateItemHandler(int a_ItemType)
void cItemHandler::Deinit()
{
for(int i = 0; i < 2267; i++)
for (int i = 0; i < 2267; i++)
{
delete m_ItemHandler[i];
m_ItemHandler[i] = NULL;

4
src/Items/ItemPickaxe.h
View File

@@ -17,7 +17,7 @@ public:
char PickaxeLevel()
{
switch(m_ItemType)
switch (m_ItemType)
{
case E_ITEM_WOODEN_PICKAXE: return 1;
case E_ITEM_GOLD_PICKAXE: return 1;
@@ -31,7 +31,7 @@ public:
virtual bool CanHarvestBlock(BLOCKTYPE a_BlockType) override
{
switch(a_BlockType)
switch (a_BlockType)
{
case E_BLOCK_OBSIDIAN:
{