Many additions to 900bc06d2c:

- Fix indentation
 - Consider any kind of light, not just torch_infinite_time
 - Hostile NPCs should also wear lights, if they have nothing else that could use the slot (or a twohanded weapon)
 - Remove redundant code and don't add additional lights to the inventory
 - World::isDark returns false for interiors which are unaffected by weather

apps/openmw/mwbase/world.hpp

@@ -428,7 +428,8 @@ namespace MWBase
 
             virtual void breakInvisibility (const MWWorld::Ptr& actor) = 0;
 
-            virtual bool isNight() const = 0;
+            // Are we in an exterior or pseudo-exterior cell and it's night?
+            virtual bool isDark() const = 0;
     };
 }
 

apps/openmw/mwmechanics/actors.cpp

@@ -448,36 +448,57 @@ namespace MWMechanics
         /**
          * Automatically equip NPCs torches at night and unequip them at day
          */
-        if (!isPlayer && !MWWorld::Class::get (ptr).getCreatureStats (ptr).isHostile())
+        if (!isPlayer)
         {
-          if (mTorchPtr.isEmpty())
+            MWWorld::ContainerStoreIterator torch = inventoryStore.end();
+            for (MWWorld::ContainerStoreIterator it = inventoryStore.begin(); it != inventoryStore.end(); ++it)
             {
-            mTorchPtr = inventoryStore.search("torch_infinite_time");
+                if (it->getTypeName() == typeid(ESM::Light).name())
+                {
+                    torch = it;
+                    break;
+                }
             }
 
-          if (MWBase::Environment::get().getWorld()->isNight())
+            if (MWBase::Environment::get().getWorld()->isDark())
             {
+                if (torch != inventoryStore.end())
+                {
+                    if (!MWWorld::Class::get (ptr).getCreatureStats (ptr).isHostile())
+                    {
+                        // For non-hostile NPCs, unequip whatever is in the left slot in favor of a light.
                         if (heldIter != inventoryStore.end() && heldIter->getTypeName() != typeid(ESM::Light).name())
-            {
                             inventoryStore.unequipItem(*heldIter, ptr);
+
+                        // Also unequip twohanded weapons which conflict with anything in CarriedLeft
+                        if (torch->getClass().canBeEquipped(*torch, ptr).first == 3)
+                            inventoryStore.unequipSlot(MWWorld::InventoryStore::Slot_CarriedRight, ptr);
                     }
-            else if (heldIter == inventoryStore.end() && !mTorchPtr.isEmpty())
+
+                    heldIter = inventoryStore.getSlot(MWWorld::InventoryStore::Slot_CarriedLeft);
+
+                    // If we have a torch and can equip it (left slot free, no
+                    // twohanded weapon in right slot), then equip it now.
+                    if (heldIter == inventoryStore.end()
+                            && torch->getClass().canBeEquipped(*torch, ptr).first == 1)
                     {
-              heldIter = inventoryStore.add(mTorchPtr, ptr);
+                        inventoryStore.equip(MWWorld::InventoryStore::Slot_CarriedLeft, torch, ptr);
-              inventoryStore.equip(MWWorld::InventoryStore::Slot_CarriedLeft, heldIter, ptr);
+                    }
                 }
             }
             else
             {
                 if (heldIter != inventoryStore.end() && heldIter->getTypeName() == typeid(ESM::Light).name())
                 {
-              inventoryStore.unequipItem(*heldIter, ptr);
+                    // At day, unequip lights and auto equip shields or other suitable items
-              inventoryStore.add(*heldIter, ptr);
+                    // (Note: autoEquip will ignore lights)
                     inventoryStore.autoEquip(ptr);
                 }
             }
         }
 
+        heldIter = inventoryStore.getSlot(MWWorld::InventoryStore::Slot_CarriedLeft);
+
         //If holding a light...
         if(heldIter.getType() == MWWorld::ContainerStore::Type_Light)
         {

apps/openmw/mwmechanics/actors.hpp

@@ -29,7 +29,6 @@ namespace MWMechanics
             PtrControllerMap mActors;
 
             std::map<std::string, int> mDeathCount;
-            MWWorld::Ptr mTorchPtr;
 
             void updateNpc(const MWWorld::Ptr &ptr, float duration, bool paused);
 

apps/openmw/mwmechanics/character.cpp

@@ -36,8 +36,6 @@
 #include "../mwworld/player.hpp"
 #include "../mwworld/class.hpp"
 #include "../mwworld/inventorystore.hpp"
-#include "../mwworld/actionequip.hpp"
-#include "../mwworld/actiontake.hpp"
 
 namespace
 {

apps/openmw/mwworld/weather.cpp

@@ -708,7 +708,9 @@ float WeatherManager::getWindSpeed() const
     return mWindSpeed;
 }
 
-bool WeatherManager::isNight() const
+bool WeatherManager::isDark() const
 {
-  return (mHour < mSunriseTime || mHour > mNightStart - 1);
+    bool exterior = (MWBase::Environment::get().getWorld()->isCellExterior()
+                     || MWBase::Environment::get().getWorld()->isCellQuasiExterior());
+    return exterior && (mHour < mSunriseTime || mHour > mNightStart - 1);
 }

apps/openmw/mwworld/weather.hpp

@@ -152,7 +152,8 @@ namespace MWWorld
 
         void modRegion(const std::string &regionid, const std::vector<char> &chances);
 
-        bool isNight() const;
+        /// @see World::isDark
+        bool isDark() const;
 
     private:
         float mHour;

apps/openmw/mwworld/worldimp.cpp

@@ -2286,8 +2286,8 @@ namespace MWWorld
         actor.getClass().getInventoryStore(actor).purgeEffect(ESM::MagicEffect::Invisibility);
     }
 
-    bool World::isNight() const
+    bool World::isDark() const
     {
-      return mWeatherManager->isNight();
+      return mWeatherManager->isDark();
     }
 }

apps/openmw/mwworld/worldimp.hpp

@@ -516,7 +516,8 @@ namespace MWWorld
                                            const MWWorld::Ptr& actor, const std::string& sourceName);
 
             virtual void breakInvisibility (const MWWorld::Ptr& actor);
-            virtual bool isNight() const;
+            // Are we in an exterior or pseudo-exterior cell and it's night?
+            virtual bool isDark() const;
     };
 }