Move actions defines into separate file.

1 files changed, 2 insertions, 21 deletions

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;