From d9d350d07b781fd6a529636555228a3788d8b55f Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sun, 24 May 2015 20:17:22 +0300 Subject: Move type ForceDisplay into separate file. --- src/CMakeLists.txt | 1 + src/Makefile.am | 1 + src/being/actorsprite.h | 1 + src/enums/simpletypes/forcedisplay.h | 28 ++++++++++++++++++++++++++++ src/enums/simpletypes/simpletypes.h | 1 - 5 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 src/enums/simpletypes/forcedisplay.h diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 4da865be0..b05892224 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1062,6 +1062,7 @@ SET(SRCS enums/simpletypes/equipm.h enums/simpletypes/equipped.h enums/simpletypes/favorite.h + enums/simpletypes/forcedisplay.h enums/simpletypes/identified.h enums/simpletypes/keep.h enums/simpletypes/modal.h diff --git a/src/Makefile.am b/src/Makefile.am index cf2618738..262d68891 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1190,6 +1190,7 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \ enums/simpletypes/equipm.h \ enums/simpletypes/equipped.h \ enums/simpletypes/favorite.h \ + enums/simpletypes/forcedisplay.h \ enums/simpletypes/identified.h \ enums/simpletypes/keep.h \ enums/simpletypes/modal.h \ diff --git a/src/being/actorsprite.h b/src/being/actorsprite.h index 06949839a..bc7aca3ee 100644 --- a/src/being/actorsprite.h +++ b/src/being/actorsprite.h @@ -33,6 +33,7 @@ #include "enums/being/targetcursortype.h" #include "enums/simpletypes/enable.h" +#include "enums/simpletypes/forcedisplay.h" #include "particle/particlelist.h" #include "particle/particlevector.h" diff --git a/src/enums/simpletypes/forcedisplay.h b/src/enums/simpletypes/forcedisplay.h new file mode 100644 index 000000000..84c2d4560 --- /dev/null +++ b/src/enums/simpletypes/forcedisplay.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_FORCEDISPLAY_H +#define ENUMS_SIMPLETYPES_FORCEDISPLAY_H + +#include "enums/simpletypes/simpledefines.h" + +defBoolEnum(ForceDisplay); + +#endif // ENUMS_SIMPLETYPES_FORCEDISPLAY_H diff --git a/src/enums/simpletypes/simpletypes.h b/src/enums/simpletypes/simpletypes.h index 6f7aa0124..7073b247d 100644 --- a/src/enums/simpletypes/simpletypes.h +++ b/src/enums/simpletypes/simpletypes.h @@ -25,7 +25,6 @@ #include "localconsts.h" -defBoolEnum(ForceDisplay); defBoolEnum(UseResman); defBoolEnum(SkipError); defBoolEnum(UseArgs); -- cgit v1.2.3-70-g09d2