diff options
author | Andrei Karas <akaras@inbox.ru> | 2016-03-24 18:48:39 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2016-03-24 18:48:39 +0300 |
commit | 3920b2449e3e55c396b3a5a46f37d965d71de42e (patch) | |
tree | 4e0d64d88c322876599e5b9818228bcec5d27571 /src/resources | |
parent | 6fb7970d0e7dca1986817deecc2854d56455486f (diff) | |
download | mv-3920b2449e3e55c396b3a5a46f37d965d71de42e.tar.gz mv-3920b2449e3e55c396b3a5a46f37d965d71de42e.tar.bz2 mv-3920b2449e3e55c396b3a5a46f37d965d71de42e.tar.xz mv-3920b2449e3e55c396b3a5a46f37d965d71de42e.zip |
Move ItemType enum into enums directory.
Diffstat (limited to 'src/resources')
-rw-r--r-- | src/resources/iteminfo.h | 3 | ||||
-rw-r--r-- | src/resources/itemtype.h | 53 | ||||
-rw-r--r-- | src/resources/itemtypemap.h | 2 |
3 files changed, 3 insertions, 55 deletions
diff --git a/src/resources/iteminfo.h b/src/resources/iteminfo.h index c07136581..59b6a0b99 100644 --- a/src/resources/iteminfo.h +++ b/src/resources/iteminfo.h @@ -25,11 +25,12 @@ #include "enums/being/gender.h" +#include "enums/resources/itemtype.h" + #include "enums/simpletypes/beingtypeid.h" #include "enums/simpletypes/itemcolor.h" #include "resources/cursor.h" -#include "resources/itemtype.h" #include "resources/soundinfo.h" #include "resources/sprite/spritedisplay.h" diff --git a/src/resources/itemtype.h b/src/resources/itemtype.h deleted file mode 100644 index 489dc3c44..000000000 --- a/src/resources/itemtype.h +++ /dev/null @@ -1,53 +0,0 @@ -/* - * The ManaPlus Client - * Copyright (C) 2004-2009 The Mana World Development Team - * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011-2016 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 RESOURCES_ITEMTYPE_H -#define RESOURCES_ITEMTYPE_H - -namespace ItemType -{ - /** - * Enumeration of available Item types. - */ - enum Type - { - UNUSABLE = 0, - USABLE, - EQUIPMENT_ONE_HAND_WEAPON, - EQUIPMENT_TWO_HANDS_WEAPON, - EQUIPMENT_TORSO, - EQUIPMENT_ARMS, // 5 - CARD, - EQUIPMENT_HEAD, - EQUIPMENT_LEGS, - EQUIPMENT_SHIELD, - EQUIPMENT_RING, - EQUIPMENT_NECKLACE, // 10 - EQUIPMENT_FEET, - EQUIPMENT_AMMO, - EQUIPMENT_CHARM, - SPRITE_RACE, - SPRITE_HAIR // 15 - }; -} // namespace ItemType - -#endif // RESOURCES_ITEMTYPE_H diff --git a/src/resources/itemtypemap.h b/src/resources/itemtypemap.h index 0f88fdb84..ccf70068b 100644 --- a/src/resources/itemtypemap.h +++ b/src/resources/itemtypemap.h @@ -21,7 +21,7 @@ #ifndef RESOURCES_ITEMTYPEMAP_H #define RESOURCES_ITEMTYPEMAP_H -#include "resources/itemtype.h" +#include "enums/resources/itemtype.h" #include <string> |