summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2015-05-24 16:52:19 +0300
committerAndrei Karas <akaras@inbox.ru>2015-05-24 16:52:19 +0300
commitb00b2fb5f1a827508f42f95feb0c0510a118914c (patch)
treeccb33815a7849c39fe831397b8e2d85adf449cce
parentc16a7324e5f2ff59d07dc9d5b5f6d91dc84bfcba (diff)
downloadmv-b00b2fb5f1a827508f42f95feb0c0510a118914c.tar.gz
mv-b00b2fb5f1a827508f42f95feb0c0510a118914c.tar.bz2
mv-b00b2fb5f1a827508f42f95feb0c0510a118914c.tar.xz
mv-b00b2fb5f1a827508f42f95feb0c0510a118914c.zip
Move type Equipped into separate file.
-rw-r--r--src/CMakeLists.txt1
-rw-r--r--src/Makefile.am1
-rw-r--r--src/enums/simpletypes/equipped.h28
-rw-r--r--src/enums/simpletypes/simpletypes.h1
-rw-r--r--src/inventory.h1
-rw-r--r--src/item.h1
6 files changed, 32 insertions, 1 deletions
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 <http://www.gnu.org/licenses/>.
+ */
+
+#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"