summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--src/main.cpp5
-rw-r--r--src/net/beinghandler.cpp1
3 files changed, 9 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 7e9691bd..c0bc698b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2007-06-30 Philipp Sehmisch <tmw@crushnet.org>
+
+ * src/main.cpp: Changed include order to avoid a problem with guichan
+ on windows.
+ * src/net/beinghandler.cpp: Implemented getting the direction of
+ attacks from the server.
+
2007-06-16 Guillaume Melquiond <guillaume.melquiong@gmail.com>
* src/resources/image.cpp: Set GL texture index to zero when an image
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)