summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2015-12-31 20:37:25 +0300
committerAndrei Karas <akaras@inbox.ru>2015-12-31 20:37:25 +0300
commitf8d9c685da7cf91310c6824b1bb9eb6940c37e54 (patch)
tree313d9360055cf2ac6fe825c7f9c1c9e451113213
parent7d987d35caf7a90b7ed0ffc942297ddc68c3da07 (diff)
downloadmv-f8d9c685da7cf91310c6824b1bb9eb6940c37e54.tar.gz
mv-f8d9c685da7cf91310c6824b1bb9eb6940c37e54.tar.bz2
mv-f8d9c685da7cf91310c6824b1bb9eb6940c37e54.tar.xz
mv-f8d9c685da7cf91310c6824b1bb9eb6940c37e54.zip
Move inputgroup into enums directory.
-rw-r--r--src/CMakeLists.txt1
-rw-r--r--src/Makefile.am1
-rw-r--r--src/enums/input/inputgroup.h45
-rw-r--r--src/input/inputactiondata.h19
4 files changed, 48 insertions, 18 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index ab6e534b5..df056585f 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -964,6 +964,7 @@ SET(SRCS
textcommand.cpp
textcommand.h
enums/input/inputaction.h
+ enums/input/inputgroup.h
input/inputactiondata.h
input/inputactionmap.h
input/inputactionoperators.cpp
diff --git a/src/Makefile.am b/src/Makefile.am
index b866b2746..5a5f0383c 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -670,6 +670,7 @@ SRC += events/actionevent.h \
gui/popupmanager.cpp \
gui/popupmanager.h \
enums/input/inputaction.h \
+ enums/input/inputgroup.h \
input/inputactionmap.h \
winver.h
diff --git a/src/enums/input/inputgroup.h b/src/enums/input/inputgroup.h
new file mode 100644
index 000000000..f27eb6629
--- /dev/null
+++ b/src/enums/input/inputgroup.h
@@ -0,0 +1,45 @@
+/*
+ * The ManaPlus Client
+ * Copyright (C) 2007 Joshua Langley <joshlangley@optusnet.com.au>
+ * Copyright (C) 2009-2010 The Mana Developers
+ * Copyright (C) 2011-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_INPUT_INPUTGROUP_H
+#define ENUMS_INPUT_INPUTGROUP_H
+
+#include "localconsts.h"
+
+namespace Input
+{
+ enum InputGroup
+ {
+ GRP_DEFAULT = 1, // default game key
+ GRP_CHAT = 2, // chat key
+ GRP_EMOTION = 4, // emotions key
+ GRP_OUTFIT = 8, // outfit key
+ GRP_GUI = 16, // gui key
+ GRP_MOVETOPOINT = 32, // move to point key
+ GRP_GUICHAN = 64, // for guichan based controls
+ GRP_REPEAT = 128, // repeat emulation keys
+ GRP_PET_EMOTION = 256, // pet emotions key
+ GRP_HOMUN_EMOTION = 512 // homunculus/mercenary emotetions key
+ };
+} // namespace Input
+
+#endif // ENUMS_INPUT_INPUTGROUP_H
diff --git a/src/input/inputactiondata.h b/src/input/inputactiondata.h
index 5acef08ac..3456ace0e 100644
--- a/src/input/inputactiondata.h
+++ b/src/input/inputactiondata.h
@@ -25,6 +25,7 @@
#include "actions/actionfuncptr.h"
+#include "enums/input/inputgroup.h"
#include "enums/input/inputtype.h"
#include "enums/simpletypes/useargs.h"
@@ -47,22 +48,4 @@ struct InputActionData final
const Protected isProtected;
};
-namespace Input
-{
- enum InputGroup
- {
- GRP_DEFAULT = 1, // default game key
- GRP_CHAT = 2, // chat key
- GRP_EMOTION = 4, // emotions key
- GRP_OUTFIT = 8, // outfit key
- GRP_GUI = 16, // gui key
- GRP_MOVETOPOINT = 32, // move to point key
- GRP_GUICHAN = 64, // for guichan based controls
- GRP_REPEAT = 128, // repeat emulation keys
- GRP_PET_EMOTION = 256, // pet emotions key
- GRP_HOMUN_EMOTION = 512 // homunculus/mercenary emotetions key
- };
-
-} // namespace Input
-
#endif // INPUT_INPUTACTIONDATA_H