From a520caf57d759e725d8e63d1c47d9b3d5e779324 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Mon, 15 Aug 2016 18:01:14 +0300 Subject: Move itemtype.h into item directory. --- src/actormanager.h | 2 +- src/being/flooritem.h | 2 +- src/enums/resources/item/itemtype.h | 44 +++++++++++++++++++++++++++++++++++++ src/enums/resources/itemtype.h | 44 ------------------------------------- src/gui/models/shopitems.h | 2 +- src/gui/widgets/selldialog.h | 2 +- src/gui/windows/buydialog.h | 2 +- src/gui/windows/tradewindow.h | 2 +- src/net/ea/inventoryitem.h | 2 +- src/net/markethandler.h | 2 +- src/resources/inventory/inventory.h | 2 +- src/resources/item/item.h | 2 +- 12 files changed, 54 insertions(+), 54 deletions(-) create mode 100644 src/enums/resources/item/itemtype.h delete mode 100644 src/enums/resources/itemtype.h diff --git a/src/actormanager.h b/src/actormanager.h index dea704e48..22a4e3e2a 100644 --- a/src/actormanager.h +++ b/src/actormanager.h @@ -25,7 +25,7 @@ #include "enums/being/actortype.h" -#include "enums/resources/itemtype.h" +#include "enums/resources/item/itemtype.h" #include "enums/simpletypes/allowsort.h" #include "enums/simpletypes/allplayers.h" diff --git a/src/being/flooritem.h b/src/being/flooritem.h index dc3c6fd0c..60e5d953d 100644 --- a/src/being/flooritem.h +++ b/src/being/flooritem.h @@ -25,7 +25,7 @@ #include "const/resources/item/cards.h" -#include "enums/resources/itemtype.h" +#include "enums/resources/item/itemtype.h" #include "enums/simpletypes/damaged.h" #include "enums/simpletypes/identified.h" diff --git a/src/enums/resources/item/itemtype.h b/src/enums/resources/item/itemtype.h new file mode 100644 index 000000000..73ad26060 --- /dev/null +++ b/src/enums/resources/item/itemtype.h @@ -0,0 +1,44 @@ +/* + * The ManaPlus Client + * 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 . + */ + +#ifndef ENUMS_RESOURCES_ITEM_ITEMTYPE_H +#define ENUMS_RESOURCES_ITEM_ITEMTYPE_H + +#include "enums/simpletypes/enumdefines.h" + +enumStart(ItemType) +{ + Healing = 0, + Unknown = 1, + Usable = 2, + Etc = 3, + Weapon = 4, + Armor = 5, + Card = 6, + PetEgg = 7, + PetArmor = 8, + Unknown2 = 9, + Ammon = 10, + DelayConsume = 11, + Cash = 18 +} +enumEnd(ItemType); + +#endif // ENUMS_RESOURCES_ITEM_ITEMTYPE_H diff --git a/src/enums/resources/itemtype.h b/src/enums/resources/itemtype.h deleted file mode 100644 index c56f03532..000000000 --- a/src/enums/resources/itemtype.h +++ /dev/null @@ -1,44 +0,0 @@ -/* - * The ManaPlus Client - * 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 . - */ - -#ifndef ENUMS_RESOURCES_ITEMTYPE_H -#define ENUMS_RESOURCES_ITEMTYPE_H - -#include "enums/simpletypes/enumdefines.h" - -enumStart(ItemType) -{ - Healing = 0, - Unknown = 1, - Usable = 2, - Etc = 3, - Weapon = 4, - Armor = 5, - Card = 6, - PetEgg = 7, - PetArmor = 8, - Unknown2 = 9, - Ammon = 10, - DelayConsume = 11, - Cash = 18 -} -enumEnd(ItemType); - -#endif // ENUMS_RESOURCES_ITEMTYPE_H diff --git a/src/gui/models/shopitems.h b/src/gui/models/shopitems.h index e9b1a922d..cc72403b0 100644 --- a/src/gui/models/shopitems.h +++ b/src/gui/models/shopitems.h @@ -23,7 +23,7 @@ #ifndef GUI_MODELS_SHOPITEMS_H #define GUI_MODELS_SHOPITEMS_H -#include "enums/resources/itemtype.h" +#include "enums/resources/item/itemtype.h" #include "enums/simpletypes/itemcolor.h" diff --git a/src/gui/widgets/selldialog.h b/src/gui/widgets/selldialog.h index 46512225f..c2ad005bd 100644 --- a/src/gui/widgets/selldialog.h +++ b/src/gui/widgets/selldialog.h @@ -23,7 +23,7 @@ #ifndef GUI_WIDGETS_SELLDIALOG_H #define GUI_WIDGETS_SELLDIALOG_H -#include "enums/resources/itemtype.h" +#include "enums/resources/item/itemtype.h" #include "enums/simpletypes/advanced.h" #include "enums/simpletypes/issell.h" diff --git a/src/gui/windows/buydialog.h b/src/gui/windows/buydialog.h index 77d5c357f..24e616152 100644 --- a/src/gui/windows/buydialog.h +++ b/src/gui/windows/buydialog.h @@ -23,7 +23,7 @@ #ifndef GUI_WINDOWS_BUYDIALOG_H #define GUI_WINDOWS_BUYDIALOG_H -#include "enums/resources/itemtype.h" +#include "enums/resources/item/itemtype.h" #include "enums/simpletypes/beingid.h" #include "enums/simpletypes/itemcolor.h" diff --git a/src/gui/windows/tradewindow.h b/src/gui/windows/tradewindow.h index f8a280a20..4920fe90c 100644 --- a/src/gui/windows/tradewindow.h +++ b/src/gui/windows/tradewindow.h @@ -25,7 +25,7 @@ #include "gui/widgets/window.h" -#include "enums/resources/itemtype.h" +#include "enums/resources/item/itemtype.h" #include "enums/simpletypes/damaged.h" #include "enums/simpletypes/equipm.h" diff --git a/src/net/ea/inventoryitem.h b/src/net/ea/inventoryitem.h index 749c51ac2..20158b115 100644 --- a/src/net/ea/inventoryitem.h +++ b/src/net/ea/inventoryitem.h @@ -25,7 +25,7 @@ #include "const/resources/item/cards.h" -#include "enums/resources/itemtype.h" +#include "enums/resources/item/itemtype.h" #include "enums/simpletypes/damaged.h" #include "enums/simpletypes/equipm.h" diff --git a/src/net/markethandler.h b/src/net/markethandler.h index 433a586e4..351948b2d 100644 --- a/src/net/markethandler.h +++ b/src/net/markethandler.h @@ -21,7 +21,7 @@ #ifndef NET_MARKETHANDLER_H #define NET_MARKETHANDLER_H -#include "enums/resources/itemtype.h" +#include "enums/resources/item/itemtype.h" #include "enums/simpletypes/itemcolor.h" diff --git a/src/resources/inventory/inventory.h b/src/resources/inventory/inventory.h index f687339cb..8d1e0c076 100644 --- a/src/resources/inventory/inventory.h +++ b/src/resources/inventory/inventory.h @@ -25,7 +25,7 @@ #include "enums/inventorytype.h" -#include "enums/resources/itemtype.h" +#include "enums/resources/item/itemtype.h" #include "enums/simpletypes/beingtypeid.h" #include "enums/simpletypes/damaged.h" diff --git a/src/resources/item/item.h b/src/resources/item/item.h index d0bb9b9f3..5ae0cbc99 100644 --- a/src/resources/item/item.h +++ b/src/resources/item/item.h @@ -25,7 +25,7 @@ #include "const/resources/item/cards.h" -#include "enums/resources/itemtype.h" +#include "enums/resources/item/itemtype.h" #include "enums/simpletypes/damaged.h" #include "enums/simpletypes/equipm.h" -- cgit v1.2.3-60-g2f50