mirror of
https://github.com/TES3MP/openmw-tes3mp.git
synced 2025-03-30 09:36:43 +00:00
Merge pull request #2262 from akortunov/guifixes
[Regression] Fix missing \n characters on the active effects tooltips
This commit is contained in:
commit
e2ed90e67b
1 changed files with 3 additions and 4 deletions
|
@ -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)
|
||||||
|
|
Loading…
Reference in a new issue