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

Add armor to switch() in ItemHandler.cpp

Browse Source
This commit is contained in:
Howaner 2014-04-24 23:03:04 +02:00
parent 9cbb3a339f
commit 376dc880b3
2 changed files with 26 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/Items/ItemHandler.cpp
View File

@ -91,12 +91,6 @@ cItemHandler * cItemHandler::GetItemHandler(int a_ItemType)
cItemHandler *cItemHandler::CreateItemHandler(int a_ItemType) cItemHandler *cItemHandler::CreateItemHandler(int a_ItemType)
{ {
// Armor
if (ItemCategory::IsArmor(a_ItemType))
{
return new cItemArmorHandler(a_ItemType);
}
switch(a_ItemType) switch(a_ItemType)
{ {
default: return new cItemHandler(a_ItemType); default: return new cItemHandler(a_ItemType);
@ -229,6 +223,31 @@ cItemHandler *cItemHandler::CreateItemHandler(int a_ItemType)
{ {
return new cItemFoodHandler(a_ItemType); return new cItemFoodHandler(a_ItemType);
} }
// Armor:
case E_ITEM_LEATHER_CAP:
case E_ITEM_GOLD_HELMET:
case E_ITEM_CHAIN_HELMET:
case E_ITEM_IRON_HELMET:
case E_ITEM_DIAMOND_HELMET:
case E_ITEM_LEATHER_TUNIC:
case E_ITEM_GOLD_CHESTPLATE:
case E_ITEM_CHAIN_CHESTPLATE:
case E_ITEM_IRON_CHESTPLATE:
case E_ITEM_DIAMOND_CHESTPLATE:
case E_ITEM_LEATHER_PANTS:
case E_ITEM_GOLD_LEGGINGS:
case E_ITEM_CHAIN_LEGGINGS:
case E_ITEM_IRON_LEGGINGS:
case E_ITEM_DIAMOND_LEGGINGS:
case E_ITEM_LEATHER_BOOTS:
case E_ITEM_GOLD_BOOTS:
case E_ITEM_CHAIN_BOOTS:
case E_ITEM_IRON_BOOTS:
case E_ITEM_DIAMOND_BOOTS:
{
return new cItemArmorHandler(a_ItemType);
}
} }
} }

2
src/UI/SlotArea.cpp
View File

@ -1108,7 +1108,7 @@ void cSlotAreaArmor::Clicked(cPlayer & a_Player, int a_SlotNum, eClickAction a_C
return; return;
} }
//Armors haven't a dbl click // Armors haven't a dbl click
if (a_ClickAction == caDblClick) if (a_ClickAction == caDblClick)
{ {
return; return;