From b00b2fb5f1a827508f42f95feb0c0510a118914c Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sun, 24 May 2015 16:52:19 +0300 Subject: Move type Equipped into separate file. --- src/CMakeLists.txt | 1 + src/Makefile.am | 1 + src/enums/simpletypes/equipped.h | 28 ++++++++++++++++++++++++++++ src/enums/simpletypes/simpletypes.h | 1 - src/inventory.h | 1 + src/item.h | 1 + 6 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 src/enums/simpletypes/equipped.h diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index db8c0ddb2..9f3824ba4 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1057,6 +1057,7 @@ SET(SRCS enums/state.h enums/simpletypes/damaged.h enums/simpletypes/equipm.h + enums/simpletypes/equipped.h enums/simpletypes/favorite.h enums/simpletypes/identified.h enums/simpletypes/simpledefines.h diff --git a/src/Makefile.am b/src/Makefile.am index fe84e9905..86ca62861 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1185,6 +1185,7 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \ enums/state.h \ enums/simpletypes/damaged.h \ enums/simpletypes/equipm.h \ + enums/simpletypes/equipped.h \ enums/simpletypes/favorite.h \ enums/simpletypes/identified.h \ enums/simpletypes/simpledefines.h \ diff --git a/src/enums/simpletypes/equipped.h b/src/enums/simpletypes/equipped.h new file mode 100644 index 000000000..569691fc1 --- /dev/null +++ b/src/enums/simpletypes/equipped.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_EQUIPPED_H +#define ENUMS_SIMPLETYPES_EQUIPPED_H + +#include "enums/simpletypes/simpledefines.h" + +defBoolEnum(Equipped); + +#endif // ENUMS_SIMPLETYPES_EQUIPPED_H diff --git a/src/enums/simpletypes/simpletypes.h b/src/enums/simpletypes/simpletypes.h index ff011b1e5..276ff83ae 100644 --- a/src/enums/simpletypes/simpletypes.h +++ b/src/enums/simpletypes/simpletypes.h @@ -25,7 +25,6 @@ #include "localconsts.h" -defBoolEnum(Equipped); defBoolEnum(Modal); defBoolEnum(ShowCenter); defBoolEnum(Notify); diff --git a/src/inventory.h b/src/inventory.h index f50a535cb..c54e001d3 100644 --- a/src/inventory.h +++ b/src/inventory.h @@ -27,6 +27,7 @@ #include "enums/simpletypes/damaged.h" #include "enums/simpletypes/equipm.h" +#include "enums/simpletypes/equipped.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 118b47f0a..5930360cb 100644 --- a/src/item.h +++ b/src/item.h @@ -25,6 +25,7 @@ #include "enums/simpletypes/damaged.h" #include "enums/simpletypes/equipm.h" +#include "enums/simpletypes/equipped.h" #include "enums/simpletypes/favorite.h" #include "enums/simpletypes/identified.h" #include "enums/simpletypes/simpletypes.h" -- cgit v1.2.3-70-g09d2