mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-03-01 05:39:41 +00:00
Code Issues Releases Wiki Activity

Merge branch 'blindness' into 'master'

Browse source 
Derive screen brightness from the blind modifier

Closes #6987

See merge request OpenMW/openmw!2372
This commit is contained in:
psi29a 2022-09-06 17:48:33 +00:00
commit c4d357df0f
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -14,6 +14,7 @@
Bug #6964: Nerasa Dralor Won't Follow Bug #6964: Nerasa Dralor Won't Follow
Bug #6974: Only harmful effects are reflected Bug #6974: Only harmful effects are reflected
Bug #6986: Sound magic effect does not make noise Bug #6986: Sound magic effect does not make noise
Bug #6987: Set/Mod Blindness should not darken the screen
Feature #6945: Support S3TC-compressed and BGR/BGRA NiPixelData Feature #6945: Support S3TC-compressed and BGR/BGRA NiPixelData
Feature #6979: Add support of loading and displaying LOD assets purely based on their filename extension Feature #6979: Add support of loading and displaying LOD assets purely based on their filename extension

2
apps/openmw/mwworld/player.cpp
View file

@ -563,7 +563,7 @@ namespace MWWorld
int blind = 0; int blind = 0;
const auto& magicEffects = playerClass.getCreatureStats(player).getMagicEffects(); const auto& magicEffects = playerClass.getCreatureStats(player).getMagicEffects();
if (!world->getGodModeState()) if (!world->getGodModeState())
blind = static_cast<int>(magicEffects.get(ESM::MagicEffect::Blind).getMagnitude()); blind = static_cast<int>(magicEffects.get(ESM::MagicEffect::Blind).getModifier());
windowMgr->setBlindness(std::clamp(blind, 0, 100)); windowMgr->setBlindness(std::clamp(blind, 0, 100));
int nightEye = static_cast<int>(magicEffects.get(ESM::MagicEffect::NightEye).getMagnitude()); int nightEye = static_cast<int>(magicEffects.get(ESM::MagicEffect::NightEye).getMagnitude());