diff options
| author | Andrei Karas <akaras@inbox.ru> | 2016-01-29 18:13:35 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2016-01-29 18:13:35 +0300 |
| commit | 366d596688506c70cbc510392be7f1224e585185 (patch) | |
| tree | df47f42c4fb6d240898427c2281b13054076f5ba /src/actions | |
| parent | b4658b5317715e13f4294e5a8c60e20af8db0744 (diff) | |
| download | manaplus-366d596688506c70cbc510392be7f1224e585185.tar.gz manaplus-366d596688506c70cbc510392be7f1224e585185.tar.bz2 manaplus-366d596688506c70cbc510392be7f1224e585185.tar.xz manaplus-366d596688506c70cbc510392be7f1224e585185.zip | |
Fix compilation with different flags and fix redefines in new SDL2.
Diffstat (limited to 'src/actions')
| -rw-r--r-- | src/actions/commands.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/actions/commands.cpp b/src/actions/commands.cpp index 1a1b07dd5..5a329f2c7 100644 --- a/src/actions/commands.cpp +++ b/src/actions/commands.cpp @@ -39,11 +39,11 @@ #ifdef EATHENA_SUPPORT #include "gui/shortcut/emoteshortcut.h" -#include "gui/windows/npcdialog.h" #endif #include "gui/windows/chatwindow.h" #include "gui/windows/inventorywindow.h" +#include "gui/windows/npcdialog.h" #include "gui/windows/outfitwindow.h" #include "gui/windows/skilldialog.h" #include "gui/windows/socialwindow.h" @@ -59,8 +59,8 @@ #include "net/homunculushandler.h" #include "net/mailhandler.h" #include "net/net.h" -#include "net/npchandler.h" #endif +#include "net/npchandler.h" #include "net/partyhandler.h" #include "net/serverfeatures.h" @@ -1139,12 +1139,16 @@ impHandler(skill) impHandler(craft) { +#ifdef EATHENA_SUPPORT const std::string args = event.args; if (args.empty() || !inventoryWindow) return false; inventoryWindow->moveItemToCraft(atoi(args.c_str())); return true; +#else + return false; +#endif } impHandler(npcClipboard) |