summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2015-05-24 16:45:11 +0300
committerAndrei Karas <akaras@inbox.ru>2015-05-24 16:45:11 +0300
commitc16a7324e5f2ff59d07dc9d5b5f6d91dc84bfcba (patch)
tree8cf5725daf951339256f1db4b74d8e7b70f05123
parent016133457789ebf11214db0c10019519e7ed3bdb (diff)
downloadmanaplus-c16a7324e5f2ff59d07dc9d5b5f6d91dc84bfcba.tar.gz
manaplus-c16a7324e5f2ff59d07dc9d5b5f6d91dc84bfcba.tar.bz2
manaplus-c16a7324e5f2ff59d07dc9d5b5f6d91dc84bfcba.tar.xz
manaplus-c16a7324e5f2ff59d07dc9d5b5f6d91dc84bfcba.zip
Move type Equipm into separate file.
-rw-r--r--src/CMakeLists.txt1
-rw-r--r--src/Makefile.am1
-rw-r--r--src/enums/simpletypes/equipm.h28
-rw-r--r--src/enums/simpletypes/simpletypes.h1
-rw-r--r--src/gui/windows/tradewindow.h1
-rw-r--r--src/inventory.h1
-rw-r--r--src/item.h1
7 files changed, 33 insertions, 1 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 9889896bc..db8c0ddb2 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1056,6 +1056,7 @@ SET(SRCS
enums/screendensity.h
enums/state.h
enums/simpletypes/damaged.h
+ enums/simpletypes/equipm.h
enums/simpletypes/favorite.h
enums/simpletypes/identified.h
enums/simpletypes/simpledefines.h
diff --git a/src/Makefile.am b/src/Makefile.am
index 294ab7d99..fe84e9905 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1184,6 +1184,7 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \
enums/screendensity.h \
enums/state.h \
enums/simpletypes/damaged.h \
+ enums/simpletypes/equipm.h \
enums/simpletypes/favorite.h \
enums/simpletypes/identified.h \
enums/simpletypes/simpledefines.h \
diff --git a/src/enums/simpletypes/equipm.h b/src/enums/simpletypes/equipm.h
new file mode 100644
index 000000000..5dd1bbf9e
--- /dev/null
+++ b/src/enums/simpletypes/equipm.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_EQUIPM_H
+#define ENUMS_SIMPLETYPES_EQUIPM_H
+
+#include "enums/simpletypes/simpledefines.h"
+
+defBoolEnum(Equipm);
+
+#endif // ENUMS_SIMPLETYPES_EQUIPM_H
diff --git a/src/enums/simpletypes/simpletypes.h b/src/enums/simpletypes/simpletypes.h
index 78d936d7d..ff011b1e5 100644
--- a/src/enums/simpletypes/simpletypes.h
+++ b/src/enums/simpletypes/simpletypes.h
@@ -25,7 +25,6 @@
#include "localconsts.h"
-defBoolEnum(Equipm);
defBoolEnum(Equipped);
defBoolEnum(Modal);
defBoolEnum(ShowCenter);
diff --git a/src/gui/windows/tradewindow.h b/src/gui/windows/tradewindow.h
index d2fe2d132..a191671d5 100644
--- a/src/gui/windows/tradewindow.h
+++ b/src/gui/windows/tradewindow.h
@@ -26,6 +26,7 @@
#include "gui/widgets/window.h"
#include "enums/simpletypes/damaged.h"
+#include "enums/simpletypes/equipm.h"
#include "enums/simpletypes/favorite.h"
#include "enums/simpletypes/identified.h"
diff --git a/src/inventory.h b/src/inventory.h
index e01f6667d..f50a535cb 100644
--- a/src/inventory.h
+++ b/src/inventory.h
@@ -26,6 +26,7 @@
#include "enums/inventorytype.h"
#include "enums/simpletypes/damaged.h"
+#include "enums/simpletypes/equipm.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 cfb0505be..118b47f0a 100644
--- a/src/item.h
+++ b/src/item.h
@@ -24,6 +24,7 @@
#define ITEM_H
#include "enums/simpletypes/damaged.h"
+#include "enums/simpletypes/equipm.h"
#include "enums/simpletypes/favorite.h"
#include "enums/simpletypes/identified.h"
#include "enums/simpletypes/simpletypes.h"