summaryrefslogtreecommitdiff
path: root/src/actions
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2015-06-05 21:49:04 +0300
committerAndrei Karas <akaras@inbox.ru>2015-06-06 12:12:22 +0300
commit2bd59adc7c456ce6f377feac8bc838e8011ebfc8 (patch)
treef2f25428e42e59b9a6d55d7c0be9a99c42e96e40 /src/actions
parentac1ef6b19f5c1405cfaa239ab367a93b17043723 (diff)
downloadmv-2bd59adc7c456ce6f377feac8bc838e8011ebfc8.tar.gz
mv-2bd59adc7c456ce6f377feac8bc838e8011ebfc8.tar.bz2
mv-2bd59adc7c456ce6f377feac8bc838e8011ebfc8.tar.xz
mv-2bd59adc7c456ce6f377feac8bc838e8011ebfc8.zip
Fix code style.
Diffstat (limited to 'src/actions')
-rw-r--r--src/actions/actions.cpp6
-rw-r--r--src/actions/chat.cpp2
-rw-r--r--src/actions/pets.cpp3
3 files changed, 4 insertions, 7 deletions
diff --git a/src/actions/actions.cpp b/src/actions/actions.cpp
index 66ad410ee..713e80a9f 100644
--- a/src/actions/actions.cpp
+++ b/src/actions/actions.cpp
@@ -36,10 +36,6 @@
#include "being/localplayer.h"
#include "being/playerinfo.h"
-#include "enums/being/attributes.h"
-
-#include "enums/gui/dialogtype.h"
-
#include "gui/gui.h"
#include "gui/popupmanager.h"
#include "gui/sdlinput.h"
@@ -107,6 +103,8 @@
#endif
#endif
+#include <sstream>
+
#include "debug.h"
extern std::string tradePartnerName;
diff --git a/src/actions/chat.cpp b/src/actions/chat.cpp
index 125a9b94c..9749e30fa 100644
--- a/src/actions/chat.cpp
+++ b/src/actions/chat.cpp
@@ -24,8 +24,6 @@
#include "actions/actiondef.h"
-#include "being/localplayer.h"
-
#include "gui/chatconsts.h"
#include "gui/windows/chatwindow.h"
diff --git a/src/actions/pets.cpp b/src/actions/pets.cpp
index 24f0d51c4..6b141bddb 100644
--- a/src/actions/pets.cpp
+++ b/src/actions/pets.cpp
@@ -40,13 +40,14 @@
#include "net/chathandler.h"
#ifdef TMWA_SUPPORT
#include "net/net.h"
+#else
+#include "utils/stringutils.h"
#endif
#include "net/pethandler.h"
#include "net/serverfeatures.h"
#include "utils/chatutils.h"
#include "utils/gettext.h"
-#include "utils/stringutils.h"
#include "debug.h"