From b8b4e4c524331b4deb0a6caa8da004430297c98a Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Mon, 14 Aug 2017 16:40:47 +0300
Subject: Replace static members usage from pointers to direct classes.

clang-tidy warning: readability-static-accessed-through-instance
---
 src/being/being.cpp       |  4 ++--
 src/being/crazymoves.cpp  |  2 +-
 src/being/localplayer.cpp | 11 +++++------
 3 files changed, 8 insertions(+), 9 deletions(-)

(limited to 'src/being')

diff --git a/src/being/being.cpp b/src/being/being.cpp
index afea7fc4b..009690a94 100644
--- a/src/being/being.cpp
+++ b/src/being/being.cpp
@@ -742,14 +742,14 @@ void Being::takeDamage(Being *restrict const attacker,
         {
             if (attacker->mType == ActorType::Player || (amount != 0))
             {
-                chatWindow->battleChatLog(strprintf("%s : Hit you  -%d",
+                ChatWindow::battleChatLog(strprintf("%s : Hit you  -%d",
                     attacker->getName().c_str(), amount),
                     ChatMsgType::BY_OTHER);
             }
         }
         else if (attacker == localPlayer && (amount != 0))
         {
-            chatWindow->battleChatLog(strprintf("%s : You hit %s -%d",
+            ChatWindow::battleChatLog(strprintf("%s : You hit %s -%d",
                 attacker->mName.c_str(),
                 mName.c_str(),
                 amount),
diff --git a/src/being/crazymoves.cpp b/src/being/crazymoves.cpp
index 463dfd1eb..5fb093d9d 100644
--- a/src/being/crazymoves.cpp
+++ b/src/being/crazymoves.cpp
@@ -757,7 +757,7 @@ void CrazyMoves::crazyMoveAe() const
             emoteId = CAST_U8(emo - 'A' + 37);
     }
     if (mMoveProgram[settings.crazyMoveState - 1] == 'e')
-        localPlayer->emote(emoteId);
+        LocalPlayer::emote(emoteId);
     else if (PacketLimiter::limitPackets(PacketType::PACKET_CHAT))
         petHandler->emote(emoteId);
 
diff --git a/src/being/localplayer.cpp b/src/being/localplayer.cpp
index 68d39f08f..44cc015d9 100644
--- a/src/being/localplayer.cpp
+++ b/src/being/localplayer.cpp
@@ -1838,8 +1838,8 @@ void LocalPlayer::setHome()
         if (mapItem != nullptr)
         {
             const int idx = socialWindow->getPortalIndex(mX, mY);
-            mapItem->setName(keyboard.getKeyShortString(
-                outfitWindow->keyName(idx)));
+            mapItem->setName(KeyboardConfig::getKeyShortString(
+                OutfitWindow::keyName(idx)));
         }
         saveHomes();
     }
@@ -1879,8 +1879,8 @@ void LocalPlayer::setHome()
             if (mapItem != nullptr)
             {
                 const int idx = socialWindow->getPortalIndex(mX, mY);
-                mapItem->setName(keyboard.getKeyShortString(
-                    outfitWindow->keyName(idx)));
+                mapItem->setName(KeyboardConfig::getKeyShortString(
+                    OutfitWindow::keyName(idx)));
             }
         }
         else
@@ -2134,8 +2134,7 @@ void LocalPlayer::updateCoords()
     {
         if (socialWindow != nullptr)
             socialWindow->updatePortals();
-        if (popupManager != nullptr)
-            popupManager->hideBeingPopup();
+        PopupManager::hideBeingPopup();
         updateMusic();
     }
 
-- 
cgit v1.2.3-60-g2f50