luanti-org/luanti
1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-10-14 00:55:20 +02:00
Code Activity

Added MaterialItem conversion from old content type namespace to new

Browse Source
This commit is contained in:
Perttu Ahola
2011-07-31 02:20:40 +03:00
parent 306bb66790
commit d6a9bec843
6 changed files with 63 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/inventory.cpp
View File

@@ -46,6 +46,18 @@ InventoryItem::~InventoryItem()
{
}
content_t content_translate_from_19_to_internal(content_t c_from)
{
for(u32 i=0; i<sizeof(trans_table_19)/sizeof(trans_table_19[0]); i++)
{
if(trans_table_19[i][1] == c_from)
{
return trans_table_19[i][0];
}
}
return c_from;
}
InventoryItem* InventoryItem::deSerialize(std::istream &is)
{
DSTACK(__FUNCTION_NAME);
@@ -58,6 +70,21 @@ InventoryItem* InventoryItem::deSerialize(std::istream &is)
if(name == "MaterialItem")
{
// u16 reads directly as a number (u8 doesn't)
u16 material;
is>>material;
u16 count;
is>>count;
// Convert old materials
if(material <= 0xff)
{
material = content_translate_from_19_to_internal(material);
}
if(material > MAX_CONTENT)
throw SerializationError("Too large material number");
return new MaterialItem(material, count);
}
else if(name == "MaterialItem2")
{
u16 material;
is>>material;
u16 count;