From c16a7324e5f2ff59d07dc9d5b5f6d91dc84bfcba Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sun, 24 May 2015 16:45:11 +0300 Subject: Move type Equipm into separate file. --- src/CMakeLists.txt | 1 + src/Makefile.am | 1 + src/enums/simpletypes/equipm.h | 28 ++++++++++++++++++++++++++++ src/enums/simpletypes/simpletypes.h | 1 - src/gui/windows/tradewindow.h | 1 + src/inventory.h | 1 + src/item.h | 1 + 7 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 src/enums/simpletypes/equipm.h diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 9889896bc..db8c0ddb2 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1056,6 +1056,7 @@ SET(SRCS enums/screendensity.h enums/state.h enums/simpletypes/damaged.h + enums/simpletypes/equipm.h enums/simpletypes/favorite.h enums/simpletypes/identified.h enums/simpletypes/simpledefines.h diff --git a/src/Makefile.am b/src/Makefile.am index 294ab7d99..fe84e9905 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1184,6 +1184,7 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \ enums/screendensity.h \ enums/state.h \ enums/simpletypes/damaged.h \ + enums/simpletypes/equipm.h \ enums/simpletypes/favorite.h \ enums/simpletypes/identified.h \ enums/simpletypes/simpledefines.h \ diff --git a/src/enums/simpletypes/equipm.h b/src/enums/simpletypes/equipm.h new file mode 100644 index 000000000..5dd1bbf9e --- /dev/null +++ b/src/enums/simpletypes/equipm.h @@ -0,0 +1,28 @@ +/* + * The ManaPlus Client + * Copyright (C) 2015 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_SIMPLETYPES_EQUIPM_H +#define ENUMS_SIMPLETYPES_EQUIPM_H + +#include "enums/simpletypes/simpledefines.h" + +defBoolEnum(Equipm); + +#endif // ENUMS_SIMPLETYPES_EQUIPM_H diff --git a/src/enums/simpletypes/simpletypes.h b/src/enums/simpletypes/simpletypes.h index 78d936d7d..ff011b1e5 100644 --- a/src/enums/simpletypes/simpletypes.h +++ b/src/enums/simpletypes/simpletypes.h @@ -25,7 +25,6 @@ #include "localconsts.h" -defBoolEnum(Equipm); defBoolEnum(Equipped); defBoolEnum(Modal); defBoolEnum(ShowCenter); diff --git a/src/gui/windows/tradewindow.h b/src/gui/windows/tradewindow.h index d2fe2d132..a191671d5 100644 --- a/src/gui/windows/tradewindow.h +++ b/src/gui/windows/tradewindow.h @@ -26,6 +26,7 @@ #include "gui/widgets/window.h" #include "enums/simpletypes/damaged.h" +#include "enums/simpletypes/equipm.h" #include "enums/simpletypes/favorite.h" #include "enums/simpletypes/identified.h" diff --git a/src/inventory.h b/src/inventory.h index e01f6667d..f50a535cb 100644 --- a/src/inventory.h +++ b/src/inventory.h @@ -26,6 +26,7 @@ #include "enums/inventorytype.h" #include "enums/simpletypes/damaged.h" +#include "enums/simpletypes/equipm.h" #include "enums/simpletypes/favorite.h" #include "enums/simpletypes/identified.h" #include "enums/simpletypes/simpletypes.h" diff --git a/src/item.h b/src/item.h index cfb0505be..118b47f0a 100644 --- a/src/item.h +++ b/src/item.h @@ -24,6 +24,7 @@ #define ITEM_H #include "enums/simpletypes/damaged.h" +#include "enums/simpletypes/equipm.h" #include "enums/simpletypes/favorite.h" #include "enums/simpletypes/identified.h" #include "enums/simpletypes/simpletypes.h" -- cgit v1.2.3-60-g2f50