ryansnewell
/
mcserver
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed incompatibility to apples c++ compiler... 

git-svn-id: http://mc-server.googlecode.com/svn/trunk@680 0a769ca7-a7f5-676a-18bf-c427514a06d6
master
lapayo94@gmail.com 2012-07-17 14:33:51 +00:00
parent f473f13585
commit aaf772f68a
4 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
source/items/Item.cpp
View File

@ -237,7 +237,10 @@ void cItemHandler::PlaceBlock(cWorld *a_World, cPlayer *a_Player, cItem *a_Item,
cBlockHandler *Handler = cBlockHandler::GetBlockHandler(Block);
Handler->PlaceBlock(a_World, a_Player, GetBlockMeta(a_Item->m_ItemHealth), a_X, a_Y, a_Z, a_Dir);
if(a_Player->GetGameMode() == eGameMode_Survival)
a_Player->GetInventory().RemoveItem(cItem(a_Item->m_ItemID, 1));
{
cItem Item(a_Item->m_ItemID, 1);
a_Player->GetInventory().RemoveItem(Item);
}
}
bool cItemHandler::EatItem(cPlayer *a_Player, cItem *a_Item)

13
source/items/ItemBucket.h
View File

@ -33,11 +33,13 @@ public:
NewItem = E_ITEM_LAVA_BUCKET;
break;
}
cItem Item(a_Item->m_ItemID, 1);
if (NewItem != E_ITEM_EMPTY
&& (a_Player->GetGameMode() == 1 || (a_Player->GetInventory().RemoveItem(cItem(a_Item->m_ItemID, 1)))))
&& (a_Player->GetGameMode() == 1 || (a_Player->GetInventory().RemoveItem(Item))))
{
//Give New Bucket
a_Player->GetInventory().AddItem(cItem(NewItem, 1));
cItem Item(NewItem, 1);
a_Player->GetInventory().AddItem(Item);
//remove water block
a_Player->GetWorld()->SetBlock(a_X, a_Y, a_Z, E_BLOCK_AIR, 0);
return true;
@ -52,7 +54,8 @@ public:
AddDirection(a_X, a_Y, a_Z, a_Dir);
if(a_World->GetBlock(a_X, a_Y, a_Z) == E_BLOCK_AIR)
{
if ((a_Player->GetGameMode() == 1) || (a_Player->GetInventory().RemoveItem(cItem(a_Item->m_ItemID, 1))))
cItem Item(a_Item->m_ItemID, 1);
if ((a_Player->GetGameMode() == 1) || (a_Player->GetInventory().RemoveItem(Item)))
{
a_World->SetBlock(a_X, a_Y, a_Z, NewBlock, 0);
@ -60,8 +63,8 @@ public:
{
break; //No new Bucket for creative players
}
a_Player->GetInventory().AddItem(cItem(E_ITEM_BUCKET, 1));
cItem Item(E_ITEM_BUCKET, 1);
a_Player->GetInventory().AddItem(Item);
return true;
}
}

3
source/items/ItemDye.h
View File

@ -22,7 +22,8 @@ public:
{
if (a_Player->GetGameMode() == eGameMode_Survival)
{
a_Player->GetInventory().RemoveItem(cItem(a_Item->m_ItemID, 1, a_Item->m_ItemHealth));
cItem Item(a_Item->m_ItemID, 1, a_Item->m_ItemHealth);
a_Player->GetInventory().RemoveItem(Item);
return true;
}
}

3
source/items/ItemSlab.h
View File

@ -23,7 +23,8 @@ public:
&& (Block == a_Item->m_ItemID) //Same slab
&& ((Meta & 0x7) == (a_Item->m_ItemHealth & 0x7))) //Same Texture
{
if(a_Player->GetInventory().RemoveItem(cItem(a_Item->m_ItemID, 1)))
cItem Item(a_Item->m_ItemID, 1);
if(a_Player->GetInventory().RemoveItem(Item))
{
a_World->SetBlock(a_X, a_Y, a_Z, Block - 1, Meta); //Block - 1 simple hack to save one if statement
return true;