From 8983972051cb5bc18c3e3dc40837b00f2e2caced Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Mon, 15 Aug 2016 17:45:58 +0300 Subject: Move itemdbtype.h into item directory. --- src/CMakeLists.txt | 2 +- src/Makefile.am | 2 +- src/enums/resources/item/itemdbtype.h | 50 +++++++++++++++++++++++++++++++++++ src/enums/resources/itemdbtype.h | 50 ----------------------------------- src/gui/popups/itempopup.h | 2 +- src/resources/iteminfo.h | 2 +- src/resources/itemtypemap.h | 2 +- 7 files changed, 55 insertions(+), 55 deletions(-) create mode 100644 src/enums/resources/item/itemdbtype.h delete mode 100644 src/enums/resources/itemdbtype.h diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 34e564376..20ffa9add 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -675,7 +675,7 @@ SET(SRCS resources/itemslot.h enums/resources/imageposition.h enums/resources/imagetype.h - enums/resources/itemdbtype.h + enums/resources/item/itemdbtype.h enums/resources/itemsoundevent.h enums/resources/itemtype.h resources/itemtypemap.h diff --git a/src/Makefile.am b/src/Makefile.am index d9c02699c..44c1141b2 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1285,7 +1285,7 @@ manaplus_SOURCES += main.cpp \ resources/itemslot.h \ enums/resources/imageposition.h \ enums/resources/imagetype.h \ - enums/resources/itemdbtype.h \ + enums/resources/item/itemdbtype.h \ enums/resources/itemsoundevent.h \ enums/resources/itemtype.h \ resources/itemtypemap.h \ diff --git a/src/enums/resources/item/itemdbtype.h b/src/enums/resources/item/itemdbtype.h new file mode 100644 index 000000000..2adba550b --- /dev/null +++ b/src/enums/resources/item/itemdbtype.h @@ -0,0 +1,50 @@ +/* + * 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 . + */ + +#ifndef ENUMS_RESOURCES_ITEM_ITEMDBTYPE_H +#define ENUMS_RESOURCES_ITEM_ITEMDBTYPE_H + +#include "enums/simpletypes/enumdefines.h" + +enumStart(ItemDbType) +{ + 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 +} +enumEnd(ItemDbType); + +#endif // ENUMS_RESOURCES_ITEM_ITEMDBTYPE_H diff --git a/src/enums/resources/itemdbtype.h b/src/enums/resources/itemdbtype.h deleted file mode 100644 index 31b53c1ad..000000000 --- a/src/enums/resources/itemdbtype.h +++ /dev/null @@ -1,50 +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 . - */ - -#ifndef ENUMS_RESOURCES_ITEMDBTYPE_H -#define ENUMS_RESOURCES_ITEMDBTYPE_H - -#include "enums/simpletypes/enumdefines.h" - -enumStart(ItemDbType) -{ - 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 -} -enumEnd(ItemDbType); - -#endif // ENUMS_RESOURCES_ITEMDBTYPE_H diff --git a/src/gui/popups/itempopup.h b/src/gui/popups/itempopup.h index b9439fe1d..cc70d41bc 100644 --- a/src/gui/popups/itempopup.h +++ b/src/gui/popups/itempopup.h @@ -24,7 +24,7 @@ #ifndef GUI_POPUPS_ITEMPOPUP_H #define GUI_POPUPS_ITEMPOPUP_H -#include "enums/resources/itemdbtype.h" +#include "enums/resources/item/itemdbtype.h" #include "enums/simpletypes/itemcolor.h" diff --git a/src/resources/iteminfo.h b/src/resources/iteminfo.h index 3eb19dc80..fd75a9f30 100644 --- a/src/resources/iteminfo.h +++ b/src/resources/iteminfo.h @@ -25,7 +25,7 @@ #include "enums/being/gender.h" -#include "enums/resources/itemdbtype.h" +#include "enums/resources/item/itemdbtype.h" #include "enums/simpletypes/beingtypeid.h" #include "enums/simpletypes/itemcolor.h" diff --git a/src/resources/itemtypemap.h b/src/resources/itemtypemap.h index c2866d430..87b5b6ff0 100644 --- a/src/resources/itemtypemap.h +++ b/src/resources/itemtypemap.h @@ -21,7 +21,7 @@ #ifndef RESOURCES_ITEMTYPEMAP_H #define RESOURCES_ITEMTYPEMAP_H -#include "enums/resources/itemdbtype.h" +#include "enums/resources/item/itemdbtype.h" #include -- cgit v1.2.3-60-g2f50