summaryrefslogtreecommitdiff
path: root/src/being
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2017-08-14 16:40:47 +0300
committerAndrei Karas <akaras@inbox.ru>2017-08-14 16:40:47 +0300
commitb8b4e4c524331b4deb0a6caa8da004430297c98a (patch)
treea2fd6f1db45e76f08c0e5c1b4e57bbb86efba57b /src/being
parentc28cd5ffb1ca37a3a6d5ee0a73828dcd092db7f1 (diff)
downloadmv-b8b4e4c524331b4deb0a6caa8da004430297c98a.tar.gz
mv-b8b4e4c524331b4deb0a6caa8da004430297c98a.tar.bz2
mv-b8b4e4c524331b4deb0a6caa8da004430297c98a.tar.xz
mv-b8b4e4c524331b4deb0a6caa8da004430297c98a.zip
Replace static members usage from pointers to direct classes.
clang-tidy warning: readability-static-accessed-through-instance
Diffstat (limited to 'src/being')
-rw-r--r--src/being/being.cpp4
-rw-r--r--src/being/crazymoves.cpp2
-rw-r--r--src/being/localplayer.cpp11
3 files changed, 8 insertions, 9 deletions
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();
}