summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorPhilipp Sehmisch <tmw@crushnet.org>2007-06-30 15:07:03 +0000
committerPhilipp Sehmisch <tmw@crushnet.org>2007-06-30 15:07:03 +0000
commit8d74404ce57618922b42913d94709f9c49d65d5d (patch)
tree1ae94ab46e7acac194102116d5a1b756927d606e /src
parent029d6efeee63ed3e0964c6759d29e885d0877135 (diff)
downloadmana-8d74404ce57618922b42913d94709f9c49d65d5d.tar.gz
mana-8d74404ce57618922b42913d94709f9c49d65d5d.tar.bz2
mana-8d74404ce57618922b42913d94709f9c49d65d5d.tar.xz
mana-8d74404ce57618922b42913d94709f9c49d65d5d.zip
Changed include order to avoid a problem with guichan on windows. Implemented getting the direction of attacks from the server.
Diffstat (limited to 'src')
-rw-r--r--src/main.cpp5
-rw-r--r--src/net/beinghandler.cpp1
2 files changed, 2 insertions, 4 deletions
diff --git a/src/main.cpp b/src/main.cpp
index 58c563ab..c39582f2 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -30,10 +30,6 @@
#include <vector>
#include <SDL_image.h>
-#ifdef WIN32
-#include <SDL_syswm.h>
-#endif
-
#include <guichan/actionlistener.hpp>
#include <guichan/sdl/sdlinput.hpp>
#include <guichan/widgets/label.hpp>
@@ -43,6 +39,7 @@
#ifndef WIN32
#include <cerrno>
#include <sys/stat.h>
+#include <SDL_syswm.h>
#endif
#if defined __APPLE__
#include <CoreFoundation/CFBundle.h>
diff --git a/src/net/beinghandler.cpp b/src/net/beinghandler.cpp
index f82a0fa8..e88914ac 100644
--- a/src/net/beinghandler.cpp
+++ b/src/net/beinghandler.cpp
@@ -523,6 +523,7 @@ void BeingHandler::handleBeingAttackMessage(MessageIn &msg)
if (!being) return;
being->setAction(Being::ATTACK);
+ being->setDirection(msg.readByte());
}
void BeingHandler::handleBeingsDamageMessage(MessageIn &msg)