From 30ff688c70b706de93454a1b294369a38664eb5b Mon Sep 17 00:00:00 2001 From: kuyondo Date: Wed, 24 Nov 2021 19:35:39 +0800 Subject: [PATCH] Create only one overencumbered messagebox --- apps/openmw/mwgui/messagebox.cpp | 9 +++++++++ apps/openmw/mwgui/messagebox.hpp | 1 + 2 files changed, 10 insertions(+) diff --git a/apps/openmw/mwgui/messagebox.cpp b/apps/openmw/mwgui/messagebox.cpp index ed6633c983..f77b274f30 100644 --- a/apps/openmw/mwgui/messagebox.cpp +++ b/apps/openmw/mwgui/messagebox.cpp @@ -93,10 +93,19 @@ 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; diff --git a/apps/openmw/mwgui/messagebox.hpp b/apps/openmw/mwgui/messagebox.hpp index 26d26bac56..b7c8e91b99 100644 --- a/apps/openmw/mwgui/messagebox.hpp +++ b/apps/openmw/mwgui/messagebox.hpp @@ -69,6 +69,7 @@ namespace MWGui float mCurrentTime; float mMaxTime; + bool mIsEncumberedMessage; protected: MessageBoxManager& mMessageBoxManager;