mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-06-19 06:41:36 +00:00
Code Issues Releases Wiki Activity

remove empty/redundant lines

Browse source
This commit is contained in:
kuyondo 2021-11-28 04:58:49 +08:00
parent eadad7a4b3
commit 6e43206d69
2 changed files with 0 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
apps/openmw/mwgui/messagebox.cpp
View file

@ -93,19 +93,10 @@ namespace MWGui
void MessageBoxManager::createMessageBox (const std::string& message, bool stat) 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); MessageBox *box = new MessageBox(*this, message);
box->mCurrentTime = 0; box->mCurrentTime = 0;
std::string realMessage = MyGUI::LanguageManager::getInstance().replaceTags(message); std::string realMessage = MyGUI::LanguageManager::getInstance().replaceTags(message);
box->mMaxTime = realMessage.length()*mMessageBoxSpeed; box->mMaxTime = realMessage.length()*mMessageBoxSpeed;
box->mIsEncumberedMessage = (message == "#{sNotifyMessage59}");
if(stat) if(stat)
mStaticMessageBox = box; mStaticMessageBox = box;
@ -154,7 +145,6 @@ namespace MWGui
return mInterMessageBoxe != nullptr; return mInterMessageBoxe != nullptr;
} }
bool MessageBoxManager::removeMessageBox (MessageBox *msgbox) bool MessageBoxManager::removeMessageBox (MessageBox *msgbox)
{ {
std::vector<MessageBox*>::iterator it; std::vector<MessageBox*>::iterator it;
@ -175,7 +165,6 @@ namespace MWGui
return mMessageBoxes; return mMessageBoxes;
} }
int MessageBoxManager::readPressedButton (bool reset) int MessageBoxManager::readPressedButton (bool reset)
{ {
int pressed = mLastButtonPressed; int pressed = mLastButtonPressed;

1
apps/openmw/mwgui/messagebox.hpp
View file

@ -72,7 +72,6 @@ namespace MWGui
float mCurrentTime; float mCurrentTime;
float mMaxTime; float mMaxTime;
bool mIsEncumberedMessage;
protected: protected:
MessageBoxManager& mMessageBoxManager; MessageBoxManager& mMessageBoxManager;