From 9ea600fb354e7de0b9a66dc065ca039e3f75d7f8 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Sat, 2 Apr 2016 21:25:09 +0300
Subject: Sort more packets. Add version checks inside packets.

---
 src/net/eathena/vendingrecv.cpp | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

(limited to 'src/net/eathena/vendingrecv.cpp')

diff --git a/src/net/eathena/vendingrecv.cpp b/src/net/eathena/vendingrecv.cpp
index 3b3b000e5..4c609a766 100644
--- a/src/net/eathena/vendingrecv.cpp
+++ b/src/net/eathena/vendingrecv.cpp
@@ -143,7 +143,14 @@ void VendingRecv::processBuyAck(Net::MessageIn &msg)
 
 void VendingRecv::processOpen(Net::MessageIn &msg)
 {
-    const int count = (msg.readInt16("len") - 8) / 22;
+    int packetLen = 22;
+    if ((serverVersion >= 8 || serverVersion == 0) &&
+        msg.getVersion() >= 20150226)
+    {
+        packetLen += 25;
+    }
+
+    const int count = (msg.readInt16("len") - 8) / packetLen;
     msg.readInt32("id");
     for (int f = 0; f < count; f ++)
     {
@@ -159,7 +166,7 @@ void VendingRecv::processOpen(Net::MessageIn &msg)
             msg.readInt16("card");
         // ++ need change to msg.getVersion()
         if ((serverVersion >= 8 || serverVersion == 0) &&
-            packetVersion >= 20150226)
+            msg.getVersion() >= 20150226)
         {
             for (int d = 0; d < 5; d ++)
             {
-- 
cgit v1.2.3-70-g09d2