summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2015-05-24 19:50:37 +0300
committerAndrei Karas <akaras@inbox.ru>2015-05-24 19:50:37 +0300
commitbfea66a6eea9628d2585e4cd33d3dd86eded1df8 (patch)
tree05f86ee8d65d6a5b79e0408d902b8f728d977144
parent94c882f9eaa7b27b18e62762e149f0fb38bfb93e (diff)
downloadmv-bfea66a6eea9628d2585e4cd33d3dd86eded1df8.tar.gz
mv-bfea66a6eea9628d2585e4cd33d3dd86eded1df8.tar.bz2
mv-bfea66a6eea9628d2585e4cd33d3dd86eded1df8.tar.xz
mv-bfea66a6eea9628d2585e4cd33d3dd86eded1df8.zip
Move type NpcNames into separate file.
-rw-r--r--src/CMakeLists.txt1
-rw-r--r--src/Makefile.am1
-rw-r--r--src/actormanager.h1
-rw-r--r--src/enums/simpletypes/npcnames.h28
-rw-r--r--src/enums/simpletypes/simpletypes.h1
5 files changed, 31 insertions, 1 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 2c92b9505..14d54e49e 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1066,6 +1066,7 @@ SET(SRCS
enums/simpletypes/modal.h
enums/simpletypes/modifiable.h
enums/simpletypes/notify.h
+ enums/simpletypes/npcnames.h
enums/simpletypes/sfx.h
enums/simpletypes/showcenter.h
enums/simpletypes/simpledefines.h
diff --git a/src/Makefile.am b/src/Makefile.am
index a7d8a413b..fcb5d3f6c 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1194,6 +1194,7 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \
enums/simpletypes/modal.h \
enums/simpletypes/modifiable.h \
enums/simpletypes/notify.h \
+ enums/simpletypes/npcnames.h \
enums/simpletypes/sfx.h \
enums/simpletypes/showcenter.h \
enums/simpletypes/simpledefines.h \
diff --git a/src/actormanager.h b/src/actormanager.h
index 0f008c4b5..08e1d005e 100644
--- a/src/actormanager.h
+++ b/src/actormanager.h
@@ -27,6 +27,7 @@
#include "enums/simpletypes/allowsort.h"
#include "enums/simpletypes/allplayers.h"
+#include "enums/simpletypes/npcnames.h"
#include "listeners/configlistener.h"
diff --git a/src/enums/simpletypes/npcnames.h b/src/enums/simpletypes/npcnames.h
new file mode 100644
index 000000000..5a6e8aa57
--- /dev/null
+++ b/src/enums/simpletypes/npcnames.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_NPCNAMES_H
+#define ENUMS_SIMPLETYPES_NPCNAMES_H
+
+#include "enums/simpletypes/simpledefines.h"
+
+defBoolEnum(NpcNames);
+
+#endif // ENUMS_SIMPLETYPES_NPCNAMES_H
diff --git a/src/enums/simpletypes/simpletypes.h b/src/enums/simpletypes/simpletypes.h
index 59655e104..057710c29 100644
--- a/src/enums/simpletypes/simpletypes.h
+++ b/src/enums/simpletypes/simpletypes.h
@@ -25,7 +25,6 @@
#include "localconsts.h"
-defBoolEnum(NpcNames);
defBoolEnum(Enable);
defBoolEnum(ForceDisplay);
defBoolEnum(UseResman);