From 49ea1aae67ae5d987e96209e2b79d3db6072c27a Mon Sep 17 00:00:00 2001 From: scrawl Date: Tue, 26 Nov 2013 15:01:22 +0100 Subject: [PATCH] Use GMST for sun damage reduction --- apps/openmw/mwmechanics/actors.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apps/openmw/mwmechanics/actors.cpp b/apps/openmw/mwmechanics/actors.cpp index 5aa846118b..def5708a62 100644 --- a/apps/openmw/mwmechanics/actors.cpp +++ b/apps/openmw/mwmechanics/actors.cpp @@ -258,9 +258,12 @@ namespace MWMechanics float timeDiff = std::min(7.f, std::max(0.f, std::abs(time - 13))); float damageScale = 1.f - timeDiff / 7.f; // When cloudy, the sun damage effect is halved + static float fMagicSunBlockedMult = MWBase::Environment::get().getWorld()->getStore().get().find( + "fMagicSunBlockedMult")->getFloat(); + int weather = MWBase::Environment::get().getWorld()->getCurrentWeather(); if (weather > 1) - damageScale *= 0.5; + damageScale *= fMagicSunBlockedMult; health.setCurrent(health.getCurrent() - magnitude * duration * damageScale); } else