From b062324beffc070a5f2d1550195cffcddd1da3b0 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sun, 24 May 2015 16:25:36 +0300 Subject: Move type Damaged into separate file. --- src/CMakeLists.txt | 1 + src/Makefile.am | 1 + src/enums/simpletypes/damaged.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/damaged.h diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 9715737d8..40abcb35f 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1055,6 +1055,7 @@ SET(SRCS sprite.h enums/screendensity.h enums/state.h + enums/simpletypes/damaged.h enums/simpletypes/identified.h enums/simpletypes/simpledefines.h enums/simpletypes/simpletypes.h diff --git a/src/Makefile.am b/src/Makefile.am index f69ae37ce..163e04de1 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1183,6 +1183,7 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \ sprite.h \ enums/screendensity.h \ enums/state.h \ + enums/simpletypes/damaged.h \ enums/simpletypes/identified.h \ enums/simpletypes/simpledefines.h \ enums/simpletypes/simpletypes.h \ diff --git a/src/enums/simpletypes/damaged.h b/src/enums/simpletypes/damaged.h new file mode 100644 index 000000000..e4240766d --- /dev/null +++ b/src/enums/simpletypes/damaged.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_DAMAGED_H +#define ENUMS_SIMPLETYPES_DAMAGED_H + +#include "enums/simpletypes/simpledefines.h" + +defBoolEnum(Damaged); + +#endif // ENUMS_SIMPLETYPES_DAMAGED_H diff --git a/src/enums/simpletypes/simpletypes.h b/src/enums/simpletypes/simpletypes.h index 1dc1fb5cb..5625637fb 100644 --- a/src/enums/simpletypes/simpletypes.h +++ b/src/enums/simpletypes/simpletypes.h @@ -25,7 +25,6 @@ #include "localconsts.h" -defBoolEnum(Damaged); defBoolEnum(Favorite); defBoolEnum(Equipm); defBoolEnum(Equipped); diff --git a/src/gui/windows/tradewindow.h b/src/gui/windows/tradewindow.h index 1d0413598..240aa960d 100644 --- a/src/gui/windows/tradewindow.h +++ b/src/gui/windows/tradewindow.h @@ -25,6 +25,7 @@ #include "gui/widgets/window.h" +#include "enums/simpletypes/damaged.h" #include "enums/simpletypes/identified.h" #include "listeners/actionlistener.h" diff --git a/src/inventory.h b/src/inventory.h index fb4bef1b6..af0a500ea 100644 --- a/src/inventory.h +++ b/src/inventory.h @@ -25,6 +25,7 @@ #include "enums/inventorytype.h" +#include "enums/simpletypes/damaged.h" #include "enums/simpletypes/identified.h" #include "enums/simpletypes/simpletypes.h" diff --git a/src/item.h b/src/item.h index 5607c9f21..d6a38733e 100644 --- a/src/item.h +++ b/src/item.h @@ -23,6 +23,7 @@ #ifndef ITEM_H #define ITEM_H +#include "enums/simpletypes/damaged.h" #include "enums/simpletypes/identified.h" #include "enums/simpletypes/simpletypes.h" -- cgit v1.2.3-70-g09d2