durations in tooltips : use "show effect duration" setting

sceneinput
Emmanuel Anne 9 years ago
parent b0d373f7e6
commit 29a84452ab

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

@ -6,6 +6,7 @@
#include <MyGUI_ImageBox.h> #include <MyGUI_ImageBox.h>
#include <components/esm/loadmgef.hpp> #include <components/esm/loadmgef.hpp>
#include <components/settings/settings.hpp>
#include "../mwbase/world.hpp" #include "../mwbase/world.hpp"
#include "../mwbase/environment.hpp" #include "../mwbase/environment.hpp"
@ -134,23 +135,24 @@ namespace MWGui
MWBase::Environment::get().getWindowManager()->getGameSettingString("spoint", "") ); MWBase::Environment::get().getWindowManager()->getGameSettingString("spoint", "") );
} }
} }
if (effectIt->mRemainingTime > -1) { if (effectIt->mRemainingTime > -1 &&
sourcesDescription += " #{sDuration}: "; Settings::Manager::getBool("show effect duration","Game")) {
float duration = effectIt->mRemainingTime; sourcesDescription += " #{sDuration}: ";
if (duration > 3600) { float duration = effectIt->mRemainingTime;
int hour = duration / 3600; if (duration > 3600) {
duration -= hour*3600; int hour = duration / 3600;
sourcesDescription += MWGui::ToolTips::toString(hour) + "h"; duration -= hour*3600;
} sourcesDescription += MWGui::ToolTips::toString(hour) + "h";
if (duration > 60) { }
int minute = duration / 60; if (duration > 60) {
duration -= minute*60; int minute = duration / 60;
sourcesDescription += MWGui::ToolTips::toString(minute) + "m"; duration -= minute*60;
} sourcesDescription += MWGui::ToolTips::toString(minute) + "m";
if (duration > 0.1) { }
sourcesDescription += MWGui::ToolTips::toString(duration) + "s"; if (duration > 0.1) {
} sourcesDescription += MWGui::ToolTips::toString(duration) + "s";
} }
}
} }
if (remainingDuration > 0.f) if (remainingDuration > 0.f)

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

Loading…
Cancel
Save