4 files changed, 41 insertions, 0 deletions
diff --git a/src/net/manaserv/effecthandler.cpp b/src/net/manaserv/effecthandler.cpp
index 2df3fe0b..7051bedd 100644
--- a/src/net/manaserv/effecthandler.cpp
+++ b/src/net/manaserv/effecthandler.cpp
@@ -25,6 +25,8 @@
 #include "effectmanager.h"
 #include "log.h"
 
+#include "gui/viewport.h"
+
 #include "net/messagein.h"
 
 #include "net/manaserv/manaserv_protocol.h"
@@ -36,6 +38,7 @@ EffectHandler::EffectHandler()
     static const Uint16 _messages[] = {
         GPMSG_CREATE_EFFECT_POS,
         GPMSG_CREATE_EFFECT_BEING,
+        GPMSG_SHAKE,
         0
     };
     handledMessages = _messages;
@@ -51,6 +54,9 @@ void EffectHandler::handleMessage(Net::MessageIn &msg)
         case GPMSG_CREATE_EFFECT_BEING:
             handleCreateEffectBeing(msg);
             break;
+        case GPMSG_SHAKE:
+            handleShake(msg);
+            break;
         default:
             break;
     }
@@ -75,4 +81,36 @@ void EffectHandler::handleCreateEffectBeing(Net::MessageIn &msg)
         logger->log("Warning: CreateEffect called for unknown being #%d", bid);
 }
 
+void EffectHandler::handleShake(Net::MessageIn &msg)
+{
+    int16_t intensityX = 0;
+    int16_t intensityY = 0;
+    float decay;
+    int duration;
+
+    switch (msg.getUnreadLength())
+    {
+        case 4:
+            intensityX =  msg.readInt16();
+            intensityY =  msg.readInt16();
+            viewport->shakeScreen(intensityX, intensityY);
+            break;
+        case 6:
+            intensityX =  msg.readInt16();
+            intensityY =  msg.readInt16();
+            decay =  msg.readInt16() / 10000.0f;
+            viewport->shakeScreen(intensityX, intensityY, decay);
+            break;
+        case 8:
+            intensityX =  msg.readInt16();
+            intensityY =  msg.readInt16();
+            decay =  msg.readInt16() / 10000.0f;
+            duration =  msg.readInt16();
+            viewport->shakeScreen(intensityX, intensityY, decay, duration);
+            break;
+        default:
+            logger->log("Warning: Received GPMSG_SHAKE message with unexpected length of %d bytes", msg.getUnreadLength());
+    }
+}
+
 } // namespace ManaServ
diff --git a/src/net/manaserv/effecthandler.h b/src/net/manaserv/effecthandler.h
index a0445aad..d31c3421 100644
--- a/src/net/manaserv/effecthandler.h
+++ b/src/net/manaserv/effecthandler.h
@@ -36,6 +36,7 @@ class EffectHandler : public MessageHandler
     private:
         void handleCreateEffectPos(Net::MessageIn &msg);
         void handleCreateEffectBeing(Net::MessageIn &msg);
+        void handleShake(Net::MessageIn &msg);
 };
 
 } // namespace ManaServ
diff --git a/src/net/manaserv/manaserv_protocol.h b/src/net/manaserv/manaserv_protocol.h
index 84f1c1a5..16e56183 100644
--- a/src/net/manaserv/manaserv_protocol.h
+++ b/src/net/manaserv/manaserv_protocol.h
@@ -163,6 +163,7 @@ enum {
     GPMSG_BEINGS_DAMAGE            = 0x0310, // { W being id, W amount }*
     GPMSG_CREATE_EFFECT_POS        = 0x0320, // W effect id, W*2 position
     GPMSG_CREATE_EFFECT_BEING      = 0x0321, // W effect id, W BeingID
+    GPMSG_SHAKE                    = 0x0330, // W intensityX, W intensityY, [W decay_times_10000, [W duration]]
 
     // Guild
     PCMSG_GUILD_CREATE                  = 0x0350, // S name
diff --git a/src/net/tmwa/playerhandler.cpp b/src/net/tmwa/playerhandler.cpp
index b82968a3..725a00cc 100644
--- a/src/net/tmwa/playerhandler.cpp
+++ b/src/net/tmwa/playerhandler.cpp
@@ -282,6 +282,7 @@ void PlayerHandler::handleMessage(Net::MessageIn &msg)
 
                 if (PlayerInfo::getAttribute(HP) == 0 && !deathNotice)
                 {
+                    viewport->shakeScreen(100);
                     deathNotice = new OkDialog(_("Message"),
                                                randomDeathMessage(),
                                                false);