teamnwah/openmw-tes3coop
2
0
Fork 1
forked from mirror/openmw-tes3mp
Code Issues Pull requests 1 Releases Wiki Activity

durations in tooltips : use "show effect duration" setting

Browse source
This commit is contained in:
Emmanuel Anne 2015-09-16 22:41:42 +02:00
parent b0d373f7e6
commit 29a84452ab
3 changed files with 24 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/openmw/mwclass/light.cpp
View file

@ -2,6 +2,7 @@
#include <components/esm/loadligh.hpp>
#include <components/esm/objectstate.hpp>
#include <components/settings/settings.hpp>
#include "../mwbase/environment.hpp"
#include "../mwbase/world.hpp"
@ -169,6 +170,7 @@ namespace MWClass
std::string text;
if (Settings::Manager::getBool("show effect duration","Game"))
text += "\n#{sDuration}: " + MWGui::ToolTips::toString(ptr.getClass().getRemainingUsageTime(ptr));
if (ref->mBase->mData.mWeight != 0)
{

4
apps/openmw/mwgui/spellicons.cpp
View file

@ -6,6 +6,7 @@
#include <MyGUI_ImageBox.h>
#include <components/esm/loadmgef.hpp>
#include <components/settings/settings.hpp>
#include "../mwbase/world.hpp"
#include "../mwbase/environment.hpp"
@ -134,7 +135,8 @@ namespace MWGui
MWBase::Environment::get().getWindowManager()->getGameSettingString("spoint", "") );
}
}
if (effectIt->mRemainingTime > -1) {
if (effectIt->mRemainingTime > -1 &&
Settings::Manager::getBool("show effect duration","Game")) {
sourcesDescription += " #{sDuration}: ";
float duration = effectIt->mRemainingTime;
if (duration > 3600) {

2
files/settings-default.cfg
View file

@ -175,6 +175,8 @@ difficulty = 0
#2: tint crosshair
#3: both
show owned = 0
# Show the remaining duration of magic effects and lights
show effect duration = false
[Saves]
character =