From 7639db02f3b0e6d5fc270aeb5a0f2bc2984eac0c Mon Sep 17 00:00:00 2001
From: Koncord <stas5978@gmail.com>
Date: Tue, 3 Jul 2018 02:28:20 +0800
Subject: [PATCH] [General] RW functions return true on success

---
 components/openmw-mp/Packets/BasePacket.hpp | 34 +++++++++++++--------
 1 file changed, 22 insertions(+), 12 deletions(-)

diff --git a/components/openmw-mp/Packets/BasePacket.hpp b/components/openmw-mp/Packets/BasePacket.hpp
index 0b6f2e2df..1d1ed0eeb 100644
--- a/components/openmw-mp/Packets/BasePacket.hpp
+++ b/components/openmw-mp/Packets/BasePacket.hpp
@@ -46,16 +46,17 @@ namespace mwmp
 
     protected:
         template<class templateType>
-        void RW(templateType &data, uint32_t size, bool write)
+        bool RW(templateType &data, uint32_t size, bool write)
         {
             if (write)
                 bs->Write(data, size);
             else
-                bs->Read(data, size);
+                return bs->Read(data, size);
+            return true;
         }
 
         template<class templateType>
-        void RW(templateType &data, bool write, bool compress = 0)
+        bool RW(templateType &data, bool write, bool compress = 0)
         {
             if (write)
             {
@@ -63,28 +64,31 @@ namespace mwmp
                     bs->WriteCompressed(data);
                 else
                     bs->Write(data);
+                return true;
             }
             else
             {
                 if (compress)
-                    bs->ReadCompressed(data);
+                    return bs->ReadCompressed(data);
                 else
-                    bs->Read(data);
+                    return bs->Read(data);
             }
         }
 
-        void RW(bool &data, bool write)
+        bool RW(bool &data, bool write)
         {
             if (write)
                 bs->Write(data);
             else
-                bs->Read(data);
+                return bs->Read(data);
+            return true;
         }
 
         const static uint32_t maxStrSize = 64 * 1024; // 64 KiB
 
-        void RW(std::string &str, bool write, bool compress = false, std::string::size_type maxSize = maxStrSize)
+        bool RW(std::string &str, bool write, bool compress = false, std::string::size_type maxSize = maxStrSize)
         {
+            bool res = true;
             if (write)
             {
                 if (compress)
@@ -100,13 +104,19 @@ namespace mwmp
             {
                 RakNet::RakString rstr;
                 if (compress)
-                    rstr.DeserializeCompressed(bs);
+                    res = rstr.DeserializeCompressed(bs);
                 else
-                    bs->Read(rstr);
+                    res = bs->Read(rstr);
 
-                rstr.Truncate(rstr.GetLength() > maxSize ? maxSize : rstr.GetLength());
-                str = rstr.C_String();
+                if (res)
+                {
+                    rstr.Truncate(rstr.GetLength() > maxSize ? maxSize : rstr.GetLength());
+                    str = rstr.C_String();
+                }
+                else
+                    str = std::string();
             }
+            return res;
         }
 
     protected: