From 6e43206d690c14f57242fdbe7ebaf201e44d33d8 Mon Sep 17 00:00:00 2001 From: kuyondo Date: Sun, 28 Nov 2021 04:58:49 +0800 Subject: [PATCH] remove empty/redundant lines --- apps/openmw/mwgui/messagebox.cpp | 11 ----------- apps/openmw/mwgui/messagebox.hpp | 1 - 2 files changed, 12 deletions(-) diff --git a/apps/openmw/mwgui/messagebox.cpp b/apps/openmw/mwgui/messagebox.cpp index 1eee2bb857..ef9ad73437 100644 --- a/apps/openmw/mwgui/messagebox.cpp +++ b/apps/openmw/mwgui/messagebox.cpp @@ -93,19 +93,10 @@ namespace MWGui void MessageBoxManager::createMessageBox (const std::string& message, bool stat) { - if (message == "#{sNotifyMessage59}") - for (MessageBox* messageBox : mMessageBoxes) - if (messageBox->mIsEncumberedMessage) - { - messageBox->mCurrentTime = 0; - return; - } - MessageBox *box = new MessageBox(*this, message); box->mCurrentTime = 0; std::string realMessage = MyGUI::LanguageManager::getInstance().replaceTags(message); box->mMaxTime = realMessage.length()*mMessageBoxSpeed; - box->mIsEncumberedMessage = (message == "#{sNotifyMessage59}"); if(stat) mStaticMessageBox = box; @@ -154,7 +145,6 @@ namespace MWGui return mInterMessageBoxe != nullptr; } - bool MessageBoxManager::removeMessageBox (MessageBox *msgbox) { std::vector::iterator it; @@ -175,7 +165,6 @@ namespace MWGui return mMessageBoxes; } - int MessageBoxManager::readPressedButton (bool reset) { int pressed = mLastButtonPressed; diff --git a/apps/openmw/mwgui/messagebox.hpp b/apps/openmw/mwgui/messagebox.hpp index 6a4cda948e..e01c54b9a5 100644 --- a/apps/openmw/mwgui/messagebox.hpp +++ b/apps/openmw/mwgui/messagebox.hpp @@ -72,7 +72,6 @@ namespace MWGui float mCurrentTime; float mMaxTime; - bool mIsEncumberedMessage; protected: MessageBoxManager& mMessageBoxManager;