Move actions defines into separate file.

4 files changed, 50 insertions, 21 deletions

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 1b529e6f6..0e8e01f3b 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -713,6 +713,7 @@ SET(SRCS
     test/testlauncher.h
     test/testmain.cpp
     test/testmain.h
+    actions/actiondef.h
     actions/actions.cpp
     actions/actions.h
     being/actor.cpp
diff --git a/src/Makefile.am b/src/Makefile.am
index 2d0f249e4..79018bc6c 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -831,6 +831,7 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \
 	      test/testlauncher.h \
 	      test/testmain.cpp \
 	      test/testmain.h \
+	      actions/actiondef.h \
 	      actions/actions.cpp \
 	      actions/actions.h \
 	      being/actor.cpp \
diff --git a/src/actions/actiondef.h b/src/actions/actiondef.h
new file mode 100644
index 000000000..9877f2d0e
--- /dev/null
+++ b/src/actions/actiondef.h
@@ -0,0 +1,46 @@
+/*
+ *  The ManaPlus Client
+ *  Copyright (C) 2012-2014  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 ACTIONS_ACTIONDEF_H
+#define ACTIONS_ACTIONDEF_H
+
+#include "gamemodifiers.h"
+#include "settings.h"
+
+#include "input/inputmanager.h"
+
+#define impHandler(name) bool name(const InputEvent &event)
+#define impHandler0(name) bool name(const InputEvent &event A_UNUSED)
+
+#define callYellowBar(name) \
+    GameModifiers::name(!inputManager.isActionActive( \
+        InputAction::STOP_ATTACK)); \
+    return true;
+
+#define callYellowBarCond(name) \
+    if (!settings.disableGameModifiers) \
+    { \
+        GameModifiers::name(!inputManager.isActionActive( \
+            InputAction::STOP_ATTACK)); \
+        return true; \
+    } \
+    return false;
+
+#endif  // ACTIONS_ACTIONDEF_H
diff --git a/src/actions/actions.cpp b/src/actions/actions.cpp
index 27ee4509c..d85bbeb78 100644
--- a/src/actions/actions.cpp
+++ b/src/actions/actions.cpp
@@ -24,18 +24,16 @@
 #include "dropshortcut.h"
 #include "emoteshortcut.h"
 #include "game.h"
-#include "gamemodifiers.h"
 #include "itemshortcut.h"
-#include "settings.h"
 #include "soundmanager.h"
 
+#include "actions/actiondef.h"
+
 #include "being/attributes.h"
 #include "being/localplayer.h"
 #include "being/playerinfo.h"
 #include "being/playerrelations.h"
 
-#include "input/inputmanager.h"
-
 #include "gui/dialogsmanager.h"
 #include "gui/gui.h"
 #include "gui/popupmanager.h"
@@ -90,23 +88,6 @@
 
 #include "debug.h"
 
-#define impHandler(name) bool name(const InputEvent &event)
-#define impHandler0(name) bool name(const InputEvent &event A_UNUSED)
-
-#define callYellowBar(name) \
-    GameModifiers::name(!inputManager.isActionActive( \
-        InputAction::STOP_ATTACK)); \
-    return true;
-
-#define callYellowBarCond(name) \
-    if (!settings.disableGameModifiers) \
-    { \
-        GameModifiers::name(!inputManager.isActionActive( \
-            InputAction::STOP_ATTACK)); \
-        return true; \
-    } \
-    return false;
-
 extern ShortcutWindow *spellShortcutWindow;
 extern std::string tradePartnerName;
 extern QuitDialog *quitDialog;