mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-02-23 06:41:08 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2262 from akortunov/guifixes

Browse Source 
[Regression] Fix missing \n characters on the active effects tooltips
This commit is contained in:
Bret Curtis 2019-03-18 08:59:31 +01:00 committed by GitHub
commit e2ed90e67b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
apps/openmw/mwgui/spellicons.cpp
View File

@ -79,14 +79,11 @@ namespace MWGui
static const float fadeTime = MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>().find("fMagicStartIconBlink")->mValue.getFloat(); static const float fadeTime = MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>().find("fMagicStartIconBlink")->mValue.getFloat();
std::vector<MagicEffectInfo>& effectInfos = effectInfoPair.second; std::vector<MagicEffectInfo>& effectInfos = effectInfoPair.second;
bool addNewLine = true; bool addNewLine = false;
for (const MagicEffectInfo& effectInfo : effectInfos) for (const MagicEffectInfo& effectInfo : effectInfos)
{ {
if (addNewLine) if (addNewLine)
{
sourcesDescription += "\n"; sourcesDescription += "\n";
addNewLine = false;
}
// if at least one of the effect sources is permanent, the effect will never wear off // if at least one of the effect sources is permanent, the effect will never wear off
if (effectInfo.mPermanent) if (effectInfo.mPermanent)
@ -161,6 +158,8 @@ namespace MWGui
sourcesDescription += MWGui::ToolTips::toString(duration) + "s"; sourcesDescription += MWGui::ToolTips::toString(duration) + "s";
} }
} }
addNewLine = true;
} }
if (remainingDuration > 0.f) if (remainingDuration > 0.f)