summaryrefslogtreecommitdiff
path: root/src/being
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-05-30 21:03:20 +0300
committerAndrei Karas <akaras@inbox.ru>2014-05-31 12:16:43 +0300
commitc0197404a15a3937ef3cd21f48a09e691a96518f (patch)
tree582b01cfc1c716b19122fe28f57abefb3bf5b716 /src/being
parent9bb11133522836a9c5e251550ac88c9a4e091c0e (diff)
downloadmanaverse-c0197404a15a3937ef3cd21f48a09e691a96518f.tar.gz
manaverse-c0197404a15a3937ef3cd21f48a09e691a96518f.tar.bz2
manaverse-c0197404a15a3937ef3cd21f48a09e691a96518f.tar.xz
manaverse-c0197404a15a3937ef3cd21f48a09e691a96518f.zip
fix code style.
Diffstat (limited to 'src/being')
-rw-r--r--src/being/being.cpp1
-rw-r--r--src/being/localplayer.cpp2
2 files changed, 2 insertions, 1 deletions
diff --git a/src/being/being.cpp b/src/being/being.cpp
index 8da2d43da..5aa95bbd6 100644
--- a/src/being/being.cpp
+++ b/src/being/being.cpp
@@ -67,7 +67,6 @@
#include "resources/emoteinfo.h"
#include "resources/emotesprite.h"
#include "resources/iteminfo.h"
-#include "resources/resourcemanager.h"
#include "resources/spriteaction.h"
#include "resources/db/avatardb.h"
diff --git a/src/being/localplayer.cpp b/src/being/localplayer.cpp
index 617671198..cc3e327cb 100644
--- a/src/being/localplayer.cpp
+++ b/src/being/localplayer.cpp
@@ -84,7 +84,9 @@
#include "utils/gettext.h"
#include "utils/timer.h"
+#ifdef USE_MUMBLE
#include "mumblemanager.h"
+#endif
#include <climits>