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

StringToItem() recognizes "ItemName:Dmg" strings.

Browse Source 
This allows commands such as "/i woodenshovel:40"
This commit is contained in:
madmaxoft 2013-10-18 18:13:20 +02:00
parent 546dbf3c53
commit 24aad485b9
1 changed files with 21 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
source/BlockID.cpp
View File

@ -79,40 +79,43 @@ public:
bool ResolveItem(const AString & a_ItemName, cItem & a_Item) bool ResolveItem(const AString & a_ItemName, cItem & a_Item)
{ {
ItemMap::iterator itr = m_Map.find(a_ItemName); // Split into parts divided by either ':' or '^'
AStringVector Split = StringSplitAndTrim(a_ItemName, ":^");
if (Split.empty())
{
return false;
}
ItemMap::iterator itr = m_Map.find(Split[0]);
if (itr != m_Map.end()) if (itr != m_Map.end())
{ {
// Resolved as a string, assign the type and the default damage / count
a_Item.m_ItemType = itr->second.first; a_Item.m_ItemType = itr->second.first;
a_Item.m_ItemDamage = itr->second.second; a_Item.m_ItemDamage = itr->second.second;
if (a_Item.m_ItemDamage == -1) if (a_Item.m_ItemDamage == -1)
{ {
a_Item.m_ItemDamage = 0; a_Item.m_ItemDamage = 0;
} }
a_Item.m_ItemCount = 1;
return true;
} }
else
// Not a resolvable string, try pure numbers: "45:6", "45^6" etc.
AStringVector Split = StringSplit(a_ItemName, ":");
if (Split.size() == 1)
{ {
Split = StringSplit(a_ItemName, "^"); // Not a resolvable string, try pure numbers: "45:6", "45^6" etc.
} a_Item.m_ItemType = (short)atoi(Split[0].c_str());
if (Split.empty()) if ((a_Item.m_ItemType == 0) && (Split[0] != "0"))
{ {
return false; // Parsing the number failed
} return false;
a_Item.m_ItemType = (short)atoi(Split[0].c_str()); }
if ((a_Item.m_ItemType == 0) && (Split[0] != "0"))
{
// Parsing the number failed
return false;
} }
// Parse the damage, if present:
if (Split.size() < 2) if (Split.size() < 2)
{ {
// Not present, set the item as valid and return success:
a_Item.m_ItemCount = 1; a_Item.m_ItemCount = 1;
return true; return true;
} }
a_Item.m_ItemDamage = atoi(Split[1].c_str()); a_Item.m_ItemDamage = atoi(Split[1].c_str());
if ((a_Item.m_ItemDamage == 0) && (Split[1] != "0")) if ((a_Item.m_ItemDamage == 0) && (Split[1] != "0"))
{ {