From 306ad2effe4d0897453e61ad787e01dc47c33076 Mon Sep 17 00:00:00 2001 From: Thorbjørn Lindeijer Date: Tue, 12 Mar 2024 13:24:16 +0100 Subject: General code cleanups * Use default member initializers * Use range-based for loops * Avoid needless pointer references for ShopItem::mDuplicates * Removed type aliases that are only used once or twice * Removed more unused includes * Removed some unused functions * Removed superfluous .c_str() * Rely on default copy and assignment operators for Vector class * Use std::unique_ptr in some places * Removed duplicated mPlayerMoney updating in SellDialog * Removed duplicated Game::handleInput call * Removed unused SDLInput::mMouseInWindow * Removed remnant of manual widget positioning in HelpWindow * Removed superfluous initialization of static pointers --- src/localplayer.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/localplayer.cpp') diff --git a/src/localplayer.cpp b/src/localplayer.cpp index 92224c03..3bc41b01 100644 --- a/src/localplayer.cpp +++ b/src/localplayer.cpp @@ -86,13 +86,13 @@ void LocalPlayer::logic() { if (mMessageTime == 0) { - MessagePair info = mMessages.front(); + const auto &[message, color] = mMessages.front(); particleEngine->addTextRiseFadeOutEffect( - info.first, + message, getPixelX(), getPixelY() - 32 - 16, - &userPalette->getColor(info.second), + &userPalette->getColor(color), gui->getInfoParticleFont(), true); mMessages.pop_front(); @@ -978,7 +978,7 @@ void LocalPlayer::setGotoTarget(Being *target) void LocalPlayer::addMessageToQueue(const std::string &message, int color) { - mMessages.push_back(MessagePair(message, color)); + mMessages.emplace_back(message, color); } void LocalPlayer::event(Event::Channel channel, const Event &event) -- cgit v1.2.3-70-g09d2