From ef8ef35d28daa3ea7dd542078ac9c0d3f7a9a5e2 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Wed, 30 Aug 2017 22:51:23 +0300
Subject: Move some variables to better scope.

---
 src/net/tmwa/beingrecv.cpp |  7 ++++++-
 src/net/tmwa/chatrecv.cpp  | 13 ++++++++-----
 src/net/tmwa/partyrecv.cpp |  8 +++++++-
 3 files changed, 21 insertions(+), 7 deletions(-)

(limited to 'src/net/tmwa')

diff --git a/src/net/tmwa/beingrecv.cpp b/src/net/tmwa/beingrecv.cpp
index 7b37d1438..d73abccc1 100644
--- a/src/net/tmwa/beingrecv.cpp
+++ b/src/net/tmwa/beingrecv.cpp
@@ -1398,11 +1398,16 @@ void BeingRecv::processIpResponse(Net::MessageIn &msg)
 
     Being *const dstBeing = actorManager->findBeing(
         msg.readBeingId("being id"));
-    const std::string ip = ipToString(msg.readInt32("ip address"));
     if (dstBeing != nullptr)
+    {
+        const std::string ip = ipToString(msg.readInt32("ip address"));
         dstBeing->setIp(ip);
+    }
     else
+    {
+        ipToString(msg.readInt32("ip address"));
         DEBUGLOGSTR("invisible player?");
+    }
 
     BLOCK_END("BeingRecv::processIpResponse")
 }
diff --git a/src/net/tmwa/chatrecv.cpp b/src/net/tmwa/chatrecv.cpp
index d0ac861df..afa501004 100644
--- a/src/net/tmwa/chatrecv.cpp
+++ b/src/net/tmwa/chatrecv.cpp
@@ -129,12 +129,15 @@ void ChatRecv::processGmChat(Net::MessageIn &msg)
         return;
     }
 
-    std::string chatMsg = msg.readRawString(chatMsgLength, "message");
-
-    if (localChatTab != nullptr)
+    if (localChatTab != nullptr &&
+        chatWindow != nullptr)
+    {
+        std::string chatMsg = msg.readRawString(chatMsgLength, "message");
+        chatWindow->addGlobalMessage(chatMsg);
+    }
+    else
     {
-        if (chatWindow != nullptr)
-            chatWindow->addGlobalMessage(chatMsg);
+        msg.readRawString(chatMsgLength, "message");
     }
     BLOCK_END("ChatRecv::processChat")
 }
diff --git a/src/net/tmwa/partyrecv.cpp b/src/net/tmwa/partyrecv.cpp
index 819b891d3..b25a501c8 100644
--- a/src/net/tmwa/partyrecv.cpp
+++ b/src/net/tmwa/partyrecv.cpp
@@ -224,7 +224,6 @@ void PartyRecv::processPartyInviteResponse(Net::MessageIn &msg)
 void PartyRecv::processPartyInvited(Net::MessageIn &msg)
 {
     const BeingId id = msg.readBeingId("account id");
-    const std::string partyName = msg.readString(24, "party name");
     std::string nick;
 
     if (actorManager != nullptr)
@@ -238,7 +237,14 @@ void PartyRecv::processPartyInvited(Net::MessageIn &msg)
     }
 
     if (socialWindow != nullptr)
+    {
+        const std::string partyName = msg.readString(24, "party name");
         socialWindow->showPartyInvite(partyName, nick, 0);
+    }
+    else
+    {
+        msg.readString(24, "party name");
+    }
 }
 
 void PartyRecv::processPartyMove(Net::MessageIn &msg)
-- 
cgit v1.2.3-70-g09d2