mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-10-31 10:56:38 +00:00
Code Issues Releases Wiki Activity

Fixes #845: NPCs hold torches during the day

Browse source 
Added check for Player character so it won't be affected by showing,
or hidding torches.

Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
This commit is contained in:
Lukasz Gromanowski 2013-12-20 01:01:30 +01:00
parent 6eb674e4e5
commit abc126e2af
1 changed files with 36 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
apps/openmw/mwmechanics/character.cpp
View file

@ -709,6 +709,8 @@ bool CharacterController::updateNpcState(bool onground, bool inwater, bool isrun
} }
} }
if (mPtr.getRefData().getHandle() != "player")
{
if (MWBase::Environment::get().getWorld()->isNight()) if (MWBase::Environment::get().getWorld()->isNight())
{ {
MWWorld::ContainerStoreIterator item = inv.getSlot(MWWorld::InventoryStore::Slot_CarriedLeft); MWWorld::ContainerStoreIterator item = inv.getSlot(MWWorld::InventoryStore::Slot_CarriedLeft);
@ -750,7 +752,7 @@ bool CharacterController::updateNpcState(bool onground, bool inwater, bool isrun
} }
} }
} }
}
return forcestateupdate; return forcestateupdate;
} }