Fixes #1195: Make NPCs equip torches in interiors under certain conditions

11 years ago · 518a32c19d
parent 84961d7843
commit 518a32c19d
1 changed files with 11 additions and 1 deletions
--- a/apps/openmw/mwworld/worldimp.cpp
+++ b/apps/openmw/mwworld/worldimp.cpp
@ -2506,7 +2506,17 @@ namespace MWWorld

    bool World::isDark() const
    {
-        return mWeatherManager->isDark();
+        MWWorld::CellStore* cell = mPlayer->getPlayer().getCell();
+        if (cell->isExterior())
+            return mWeatherManager->isDark();
+        else
+        {
+            uint32_t ambient = cell->getCell()->mAmbi.mAmbient;
+            int ambientTotal = (ambient & 0xff)
+                    + ((ambient>>8) & 0xff)
+                    + ((ambient>>16) & 0xff);
+            return !(cell->getCell()->mData.mFlags & ESM::Cell::NoSleep) && ambientTotal <= 201;
+        }
    }

    bool World::findInteriorPositionInWorldSpace(MWWorld::CellStore* cell, Ogre::Vector3& result)