summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2015-05-24 18:01:15 +0300
committerAndrei Karas <akaras@inbox.ru>2015-05-24 18:01:15 +0300
commit2db3122516fc742e3a0a694a4fdc647fbb4ed90a (patch)
tree5c8afa48f2fca125bfeda2778a9598e0bc92127c
parente04f5805bdc7af8c297fd5b458836c63314341e1 (diff)
downloadmv-2db3122516fc742e3a0a694a4fdc647fbb4ed90a.tar.gz
mv-2db3122516fc742e3a0a694a4fdc647fbb4ed90a.tar.bz2
mv-2db3122516fc742e3a0a694a4fdc647fbb4ed90a.tar.xz
mv-2db3122516fc742e3a0a694a4fdc647fbb4ed90a.zip
Move type Keep into separate file.
-rw-r--r--src/CMakeLists.txt1
-rw-r--r--src/Makefile.am1
-rw-r--r--src/being/localplayer.h2
-rw-r--r--src/being/playerinfo.h1
-rw-r--r--src/enums/simpletypes/keep.h28
-rw-r--r--src/enums/simpletypes/simpletypes.h1
-rw-r--r--src/net/homunculushandler.h1
-rw-r--r--src/net/mercenaryhandler.h1
-rw-r--r--src/net/playerhandler.h1
9 files changed, 36 insertions, 1 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 0c3fe5056..f8fa142fb 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1060,6 +1060,7 @@ SET(SRCS
enums/simpletypes/equipped.h
enums/simpletypes/favorite.h
enums/simpletypes/identified.h
+ enums/simpletypes/keep.h
enums/simpletypes/modal.h
enums/simpletypes/notify.h
enums/simpletypes/sfx.h
diff --git a/src/Makefile.am b/src/Makefile.am
index d4111f957..5e721472a 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1188,6 +1188,7 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \
enums/simpletypes/equipped.h \
enums/simpletypes/favorite.h \
enums/simpletypes/identified.h \
+ enums/simpletypes/keep.h \
enums/simpletypes/modal.h \
enums/simpletypes/notify.h \
enums/simpletypes/sfx.h \
diff --git a/src/being/localplayer.h b/src/being/localplayer.h
index 2ada30488..727ce5d6b 100644
--- a/src/being/localplayer.h
+++ b/src/being/localplayer.h
@@ -27,6 +27,8 @@
#include "enums/being/pickup.h"
+#include "enums/simpletypes/keep.h"
+
#include "gui/userpalette.h"
#include "listeners/actorspritelistener.h"
diff --git a/src/being/playerinfo.h b/src/being/playerinfo.h
index b60757931..35436d694 100644
--- a/src/being/playerinfo.h
+++ b/src/being/playerinfo.h
@@ -27,6 +27,7 @@
#include "enums/guildpositionflags.h"
#include "enums/state.h"
+#include "enums/simpletypes/keep.h"
#include "enums/simpletypes/notify.h"
#include "enums/simpletypes/sfx.h"
#include "enums/simpletypes/simpletypes.h"
diff --git a/src/enums/simpletypes/keep.h b/src/enums/simpletypes/keep.h
new file mode 100644
index 000000000..a172a1242
--- /dev/null
+++ b/src/enums/simpletypes/keep.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 <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef ENUMS_SIMPLETYPES_KEEP_H
+#define ENUMS_SIMPLETYPES_KEEP_H
+
+#include "enums/simpletypes/simpledefines.h"
+
+defBoolEnum(Keep);
+
+#endif // ENUMS_SIMPLETYPES_KEEP_H
diff --git a/src/enums/simpletypes/simpletypes.h b/src/enums/simpletypes/simpletypes.h
index 9ad328fd4..5839bbe0e 100644
--- a/src/enums/simpletypes/simpletypes.h
+++ b/src/enums/simpletypes/simpletypes.h
@@ -25,7 +25,6 @@
#include "localconsts.h"
-defBoolEnum(Keep);
defBoolEnum(Modifiable);
defBoolEnum(AllPlayers);
defBoolEnum(AllowSort);
diff --git a/src/net/homunculushandler.h b/src/net/homunculushandler.h
index d26fc7b5d..62e8615f3 100644
--- a/src/net/homunculushandler.h
+++ b/src/net/homunculushandler.h
@@ -23,6 +23,7 @@
#ifdef EATHENA_SUPPORT
+#include "enums/simpletypes/keep.h"
#include "enums/simpletypes/simpletypes.h"
#include <string>
diff --git a/src/net/mercenaryhandler.h b/src/net/mercenaryhandler.h
index 1abd48aec..a61313c37 100644
--- a/src/net/mercenaryhandler.h
+++ b/src/net/mercenaryhandler.h
@@ -23,6 +23,7 @@
#ifdef EATHENA_SUPPORT
+#include "enums/simpletypes/keep.h"
#include "enums/simpletypes/simpletypes.h"
#include <string>
diff --git a/src/net/playerhandler.h b/src/net/playerhandler.h
index 657791340..44001e7c4 100644
--- a/src/net/playerhandler.h
+++ b/src/net/playerhandler.h
@@ -27,6 +27,7 @@
#include "enums/being/beingaction.h"
+#include "enums/simpletypes/keep.h"
#include "enums/simpletypes/notify.h"
#include "net/messagein.h"