From 3e90ddd9ab26d75a6a1e59df096ccdb284247801 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Mon, 19 Oct 2015 18:49:30 +0300
Subject: Add extended riding support (hercules)

---
 src/net/eathena/beingrecv.cpp | 32 +++++++++++++++++++++++---------
 1 file changed, 23 insertions(+), 9 deletions(-)

(limited to 'src/net')

diff --git a/src/net/eathena/beingrecv.cpp b/src/net/eathena/beingrecv.cpp
index 23f731c2d..590d86cad 100644
--- a/src/net/eathena/beingrecv.cpp
+++ b/src/net/eathena/beingrecv.cpp
@@ -1363,21 +1363,35 @@ void BeingRecv::processBeingAttrs(Net::MessageIn &msg)
     const int len = msg.readInt16("len");
     if (len < 12)
         return;
+    const bool haveMount = serverFeatures->haveExtendedRiding();
+    if (haveMount && len < 14)
+        return;
+
     Being *const dstBeing = actorManager->findBeing(
         msg.readBeingId("player id"));
     const int gmLevel = msg.readInt32("gm level");
-    if (dstBeing && gmLevel)
+    uint16_t mount = 0;
+    if (haveMount)
+        mount = msg.readInt16("mount");
+    if (dstBeing)
     {
-        if (dstBeing == localPlayer)
-            localPlayer->setGMLevel(gmLevel);
-        dstBeing->setGM(true);
+        if (gmLevel)
+        {
+            if (dstBeing == localPlayer)
+                localPlayer->setGMLevel(gmLevel);
+            dstBeing->setGM(true);
+        }
+        else
+        {
+            if (dstBeing == localPlayer)
+                localPlayer->setGMLevel(0);
+            if (dstBeing)
+                dstBeing->setGM(false);
+        }
     }
-    else
+    if (haveMount)
     {
-        if (dstBeing == localPlayer)
-            localPlayer->setGMLevel(0);
-        if (dstBeing)
-            dstBeing->setGM(false);
+        dstBeing->setHorse(mount);
     }
 }
 
-- 
cgit v1.2.3-60-g2f50