summaryrefslogtreecommitdiff
path: root/src/actions
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2015-03-13 17:12:06 +0300
committerAndrei Karas <akaras@inbox.ru>2015-03-13 17:12:06 +0300
commitadb67cb947885af8f74eb8ad943d2862a198805d (patch)
tree13aac08184c59cae8b48a59293b64875b3f09ae5 /src/actions
parent357560f6a8a0b61d94b6a70a519a2d3ece6f364d (diff)
downloadmv-adb67cb947885af8f74eb8ad943d2862a198805d.tar.gz
mv-adb67cb947885af8f74eb8ad943d2862a198805d.tar.bz2
mv-adb67cb947885af8f74eb8ad943d2862a198805d.tar.xz
mv-adb67cb947885af8f74eb8ad943d2862a198805d.zip
fix code style.
Diffstat (limited to 'src/actions')
-rw-r--r--src/actions/actions.cpp4
-rw-r--r--src/actions/commands.cpp4
2 files changed, 7 insertions, 1 deletions
diff --git a/src/actions/actions.cpp b/src/actions/actions.cpp
index 9f73f15ee..7d8e18591 100644
--- a/src/actions/actions.cpp
+++ b/src/actions/actions.cpp
@@ -78,12 +78,14 @@
#include "net/gamehandler.h"
#include "net/inventoryhandler.h"
#include "net/ipc.h"
+#ifdef EATHENA_SUPPORT
#include "net/mercenaryhandler.h"
+#include "net/vendinghandler.h"
+#endif
#include "net/npchandler.h"
#include "net/playerhandler.h"
#include "net/serverfeatures.h"
#include "net/uploadcharinfo.h"
-#include "net/vendinghandler.h"
#include "net/tradehandler.h"
#include "resources/iteminfo.h"
diff --git a/src/actions/commands.cpp b/src/actions/commands.cpp
index f51620e11..f7ad89b68 100644
--- a/src/actions/commands.cpp
+++ b/src/actions/commands.cpp
@@ -22,7 +22,9 @@
#include "actormanager.h"
#include "configuration.h"
+#ifdef EATHENA_SUPPORT
#include "emoteshortcut.h"
+#endif
#include "game.h"
#include "inventory.h"
#include "item.h"
@@ -46,7 +48,9 @@
#include "net/adminhandler.h"
#include "net/chathandler.h"
#include "net/guildhandler.h"
+#ifdef EATHENA_SUPPORT
#include "net/homunculushandler.h"
+#endif
#include "net/partyhandler.h"
#include "net/serverfeatures.h"