summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2015-05-24 17:34:08 +0300
committerAndrei Karas <akaras@inbox.ru>2015-05-24 17:34:08 +0300
commit2444c4f0d666ceb4ca6512edcc1b2e340a146bd7 (patch)
treea53b82e8b10c20a63116400c77185688b98ac12b
parentff7aeb6fb2b38d0a18defd06c2787a0784bc7d62 (diff)
downloadmanaplus-2444c4f0d666ceb4ca6512edcc1b2e340a146bd7.tar.gz
manaplus-2444c4f0d666ceb4ca6512edcc1b2e340a146bd7.tar.bz2
manaplus-2444c4f0d666ceb4ca6512edcc1b2e340a146bd7.tar.xz
manaplus-2444c4f0d666ceb4ca6512edcc1b2e340a146bd7.zip
Move type Trading into separate file.
-rw-r--r--src/CMakeLists.txt1
-rw-r--r--src/Makefile.am1
-rw-r--r--src/being/playerinfo.h1
-rw-r--r--src/enums/simpletypes/simpletypes.h1
-rw-r--r--src/enums/simpletypes/trading.h28
5 files changed, 31 insertions, 1 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 0e74b937a..edead124a 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1065,6 +1065,7 @@ SET(SRCS
enums/simpletypes/showcenter.h
enums/simpletypes/simpledefines.h
enums/simpletypes/simpletypes.h
+ enums/simpletypes/trading.h
statuseffect.cpp
statuseffect.h
render/surfacegraphics.cpp
diff --git a/src/Makefile.am b/src/Makefile.am
index 8f042476f..5974a48b5 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1193,6 +1193,7 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \
enums/simpletypes/showcenter.h \
enums/simpletypes/simpledefines.h \
enums/simpletypes/simpletypes.h \
+ enums/simpletypes/trading.h \
statuseffect.cpp \
statuseffect.h \
render/surfacegraphics.cpp \
diff --git a/src/being/playerinfo.h b/src/being/playerinfo.h
index 295df904b..b7b760afd 100644
--- a/src/being/playerinfo.h
+++ b/src/being/playerinfo.h
@@ -29,6 +29,7 @@
#include "enums/simpletypes/notify.h"
#include "enums/simpletypes/simpletypes.h"
+#include "enums/simpletypes/trading.h"
#include <map>
#ifdef EATHENA_SUPPORT
diff --git a/src/enums/simpletypes/simpletypes.h b/src/enums/simpletypes/simpletypes.h
index 6e8bebb3a..57bb6c76d 100644
--- a/src/enums/simpletypes/simpletypes.h
+++ b/src/enums/simpletypes/simpletypes.h
@@ -25,7 +25,6 @@
#include "localconsts.h"
-defBoolEnum(Trading);
defBoolEnum(Sfx);
defBoolEnum(Keep);
defBoolEnum(Modifiable);
diff --git a/src/enums/simpletypes/trading.h b/src/enums/simpletypes/trading.h
new file mode 100644
index 000000000..767553d4e
--- /dev/null
+++ b/src/enums/simpletypes/trading.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_TRADING_H
+#define ENUMS_SIMPLETYPES_TRADING_H
+
+#include "enums/simpletypes/simpledefines.h"
+
+defBoolEnum(Trading);
+
+#endif // ENUMS_SIMPLETYPES_TRADING_H