/*
-Minetest-c55
-Copyright (C) 2010-2011 celeron55, Perttu Ahola <celeron55@gmail.com>
+Minetest
+Copyright (C) 2010-2013 celeron55, Perttu Ahola <celeron55@gmail.com>
This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
+it under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation; either version 2.1 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
+GNU Lesser General Public License for more details.
-You should have received a copy of the GNU General Public License along
+You should have received a copy of the GNU Lesser General Public License along
with this program; if not, write to the Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include "inventory.h"
#include "serialization.h"
-#include "utility.h"
#include "debug.h"
#include <sstream>
#include "log.h"
#include "strfnd.h"
#include "content_mapnode.h" // For loading legacy MaterialItems
#include "nameidmapping.h" // For loading legacy MaterialItems
+#include "util/serialize.h"
+#include "util/string.h"
/*
ItemStack
// Convert old materials
if(material <= 0xff)
material = content_translate_from_19_to_internal(material);
- if(material > MAX_CONTENT)
+ if(material > 0xfff)
throw SerializationError("Too large material number");
// Convert old id to name
NameIdMapping legacy_nimap;
is>>material;
u16 materialcount;
is>>materialcount;
- if(material > MAX_CONTENT)
+ if(material > 0xfff)
throw SerializationError("Too large material number");
// Convert old id to name
NameIdMapping legacy_nimap;
{
m_name = name;
m_size = size;
+ m_width = 0;
m_itemdef = itemdef;
clearItems();
//m_dirty = false;
m_size = newsize;
}
+void InventoryList::setWidth(u32 newwidth)
+{
+ m_width = newwidth;
+}
+
+void InventoryList::setName(const std::string &name)
+{
+ m_name = name;
+}
+
void InventoryList::serialize(std::ostream &os) const
{
//os.imbue(std::locale("C"));
+ os<<"Width "<<m_width<<"\n";
+
for(u32 i=0; i<m_items.size(); i++)
{
const ItemStack &item = m_items[i];
clearItems();
u32 item_i = 0;
+ m_width = 0;
for(;;)
{
{
break;
}
+ else if(name == "Width")
+ {
+ iss >> m_width;
+ if (iss.fail())
+ throw SerializationError("incorrect width property");
+ }
else if(name == "Item")
{
if(item_i > getSize() - 1)
throw SerializationError("too many items");
m_items[item_i++].clear();
}
- else
- {
- throw SerializationError("Unknown inventory identifier");
- }
}
}
{
m_items = other.m_items;
m_size = other.m_size;
+ m_width = other.m_width;
m_name = other.m_name;
m_itemdef = other.m_itemdef;
//setDirty(true);
return *this;
}
+bool InventoryList::operator == (const InventoryList &other) const
+{
+ if(m_size != other.m_size)
+ return false;
+ if(m_width != other.m_width)
+ return false;
+ if(m_name != other.m_name)
+ return false;
+ for(u32 i=0; i<m_items.size(); i++)
+ {
+ ItemStack s1 = m_items[i];
+ ItemStack s2 = other.m_items[i];
+ if(s1.name != s2.name || s1.wear!= s2.wear || s1.count != s2.count ||
+ s1.metadata != s2.metadata)
+ return false;
+ }
+
+ return true;
+}
+
const std::string &InventoryList::getName() const
{
return m_name;
return m_items.size();
}
+u32 InventoryList::getWidth() const
+{
+ return m_width;
+}
+
u32 InventoryList::getUsedSlots() const
{
u32 num = 0;
return *this;
}
+bool Inventory::operator == (const Inventory &other) const
+{
+ if(m_lists.size() != other.m_lists.size())
+ return false;
+
+ for(u32 i=0; i<m_lists.size(); i++)
+ {
+ if(*m_lists[i] != *other.m_lists[i])
+ return false;
+ }
+ return true;
+}
+
void Inventory::serialize(std::ostream &os) const
{
for(u32 i=0; i<m_lists.size(); i++)
}
else
{
- throw SerializationError("Unknown inventory identifier");
+ throw SerializationError("invalid inventory specifier");
}
}
}
}
else
{
+ //don't create list with invalid name
+ if (name.find(" ") != std::string::npos) return NULL;
+
InventoryList *list = new InventoryList(name, size, m_itemdef);
m_lists.push_back(list);
return list;