diff options
| -rw-r--r-- | src/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | src/Makefile.am | 1 | ||||
| -rw-r--r-- | src/net/ea/inventoryhandler.h | 27 | ||||
| -rw-r--r-- | src/net/ea/inventoryitem.h | 57 |
4 files changed, 60 insertions, 26 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index d3ff59769..de85faf2d 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -484,6 +484,7 @@ SET(SRCS net/generalhandler.h net/guildhandler.h net/inventoryhandler.h + net/inventoryitem.h net/logindata.h net/loginhandler.h net/messagehandler.h diff --git a/src/Makefile.am b/src/Makefile.am index 316512827..61ec42b15 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -596,6 +596,7 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \ net/generalhandler.h \ net/guildhandler.h \ net/inventoryhandler.h \ + net/inventoryitem.h \ net/logindata.h \ net/loginhandler.h \ net/messagehandler.h \ diff --git a/src/net/ea/inventoryhandler.h b/src/net/ea/inventoryhandler.h index 670153aed..cd32f28a6 100644 --- a/src/net/ea/inventoryhandler.h +++ b/src/net/ea/inventoryhandler.h @@ -35,6 +35,7 @@ #include "net/inventoryhandler.h" #include "net/ea/equipbackend.h" +#include "net/ea/inventoryitem.h" #include <vector> #include <queue> @@ -47,32 +48,6 @@ namespace Net namespace Ea { -/** - * Used to cache storage data until we get size data for it. - */ -class InventoryItem -{ - public: - int slot; - int id; - int quantity; - int refine; - unsigned char color; - bool equip; - - InventoryItem(const int slot0, const int id0, const int quantity0, - const int refine0, const unsigned char color0, - const bool equip0) : - slot(slot0), - id(id0), - quantity(quantity0), - refine(refine0), - color(color0), - equip(equip0) - { - } -}; - typedef std::vector<InventoryItem> InventoryItems; class InventoryHandler : public Net::InventoryHandler diff --git a/src/net/ea/inventoryitem.h b/src/net/ea/inventoryitem.h new file mode 100644 index 000000000..6b15a3fa2 --- /dev/null +++ b/src/net/ea/inventoryitem.h @@ -0,0 +1,57 @@ +/* + * The ManaPlus Client + * Copyright (C) 2004-2009 The Mana World Development Team + * Copyright (C) 2009-2010 The Mana Developers + * Copyright (C) 2011-2014 The ManaPlus Developers + * + * This file is part of The ManaPlus Client. + * + * 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 + * 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. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + */ + +#ifndef NET_EA_INVENTORYITEM_H +#define NET_EA_INVENTORYITEM_H + +namespace Ea +{ + +/** + * Used to cache storage data until we get size data for it. + */ +class InventoryItem +{ + public: + int slot; + int id; + int quantity; + int refine; + unsigned char color; + bool equip; + + InventoryItem(const int slot0, const int id0, const int quantity0, + const int refine0, const unsigned char color0, + const bool equip0) : + slot(slot0), + id(id0), + quantity(quantity0), + refine(refine0), + color(color0), + equip(equip0) + { + } +}; + +} // namespace Ea + +#endif // NET_EA_INVENTORYITEM_H |