mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-04 02:41:19 +00:00
Code Issues Projects 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

4
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,7 +170,8 @@ namespace MWClass
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)
{
text += "\n#{sWeight}: " + MWGui::ToolTips::toString(ref->mBase->mData.mWeight);

36
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,23 +135,24 @@ namespace MWGui
MWBase::Environment::get().getWindowManager()->getGameSettingString("spoint", "") );
}
}
if (effectIt->mRemainingTime > -1) {
sourcesDescription += " #{sDuration}: ";
float duration = effectIt->mRemainingTime;
if (duration > 3600) {
int hour = duration / 3600;
duration -= hour*3600;
sourcesDescription += MWGui::ToolTips::toString(hour) + "h";
}
if (duration > 60) {
int minute = duration / 60;
duration -= minute*60;
sourcesDescription += MWGui::ToolTips::toString(minute) + "m";
}
if (duration > 0.1) {
sourcesDescription += MWGui::ToolTips::toString(duration) + "s";
}
}
if (effectIt->mRemainingTime > -1 &&
Settings::Manager::getBool("show effect duration","Game")) {
sourcesDescription += " #{sDuration}: ";
float duration = effectIt->mRemainingTime;
if (duration > 3600) {
int hour = duration / 3600;
duration -= hour*3600;
sourcesDescription += MWGui::ToolTips::toString(hour) + "h";
}
if (duration > 60) {
int minute = duration / 60;
duration -= minute*60;
sourcesDescription += MWGui::ToolTips::toString(minute) + "m";
}
if (duration > 0.1) {
sourcesDescription += MWGui::ToolTips::toString(duration) + "s";
}
}
}
if (remainingDuration > 0.f)

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 =