mirror of
https://github.com/OpenMW/openmw.git
synced 2025-02-22 19:39:42 +00:00
Merge branch 'weirdcommitname' into 'master'
Assault victims are always aware of the committed crime (bug #7064) Closes #7064 See merge request OpenMW/openmw!2725
This commit is contained in:
commit
02d1271bc3
2 changed files with 4 additions and 0 deletions
|
@ -34,6 +34,7 @@
|
||||||
Bug #7042: Weapon follow animations that immediately follow the hit animations cause multiple hits
|
Bug #7042: Weapon follow animations that immediately follow the hit animations cause multiple hits
|
||||||
Bug #7044: Changing a class' services does not affect autocalculated NPCs
|
Bug #7044: Changing a class' services does not affect autocalculated NPCs
|
||||||
Bug #7054: Quests aren't sorted by name
|
Bug #7054: Quests aren't sorted by name
|
||||||
|
Bug #7064: NPCs don't report crime if the player is casting offensive spells on them while sneaking
|
||||||
Bug #7084: Resurrecting an actor doesn't take into account base record changes
|
Bug #7084: Resurrecting an actor doesn't take into account base record changes
|
||||||
Bug #7088: Deleting last save game of last character doesn't clear character name/details
|
Bug #7088: Deleting last save game of last character doesn't clear character name/details
|
||||||
Bug #7092: BSA archives from higher priority directories don't take priority
|
Bug #7092: BSA archives from higher priority directories don't take priority
|
||||||
|
|
|
@ -1137,6 +1137,9 @@ namespace MWMechanics
|
||||||
if (player != getPlayer())
|
if (player != getPlayer())
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
|
if (type == OT_Assault)
|
||||||
|
victimAware = true;
|
||||||
|
|
||||||
// Find all the actors within the alarm radius
|
// Find all the actors within the alarm radius
|
||||||
std::vector<MWWorld::Ptr> neighbors;
|
std::vector<MWWorld::Ptr> neighbors;
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue