fix integer overflow (fixes #414)

[oweals/minetest.git] / src / inventory.h

diff --git a/src/inventory.h b/src/inventory.h
index e280bbf798486b733c0771c0baa4609a98208003..5f90183d2302ac6d3e0fe3f8e28065b930e94468 100644 (file)
--- a/src/inventory.h
+++ b/src/inventory.h
@@ -3,16 +3,16 @@ Minetest-c55
 Copyright (C) 2010-2011 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.
 */
@@ -24,7 +24,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include <sstream>
 #include <string>
 #include <vector>
-#include "common_irrlicht.h"
+#include "irrlichttypes_bloated.h"
 #include "debug.h"
 #include "itemdef.h"
 
@@ -176,6 +176,7 @@ public:
        ~InventoryList();
        void clearItems();
        void setSize(u32 newsize);
+       void setWidth(u32 newWidth);
        void setName(const std::string &name);
        void serialize(std::ostream &os) const;
        void deSerialize(std::istream &is);
@@ -185,6 +186,7 @@ public:
 
        const std::string &getName() const;
        u32 getSize() const;
+       u32 getWidth() const;
        // Count used slots
        u32 getUsedSlots() const;
        u32 getFreeSlots() const;
@@ -240,7 +242,7 @@ public:
 
 private:
        std::vector<ItemStack> m_items;
-       u32 m_size;
+       u32 m_size, m_width;
        std::string m_name;
        IItemDefManager *m_itemdef;
 };