mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-04-13 02:06:44 +00:00
Code Issues Releases Wiki Activity

Merge branch '5055fix' into 'master'

Browse source 
Fix Non-swimming enemies entering water if player is water walking (bug #5099)

See merge request OpenMW/openmw!136
This commit is contained in:
Alexei Dobrohotov 2019-08-01 10:02:36 +00:00
commit 1fdc5151ca
2 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -114,6 +114,7 @@
Bug #5082: Scrolling with controller in GUI mode is broken Bug #5082: Scrolling with controller in GUI mode is broken
Bug #5092: NPCs with enchanted weapons play sound when out of charges Bug #5092: NPCs with enchanted weapons play sound when out of charges
Bug #5093: Hand to hand sound plays on knocked out enemies Bug #5093: Hand to hand sound plays on knocked out enemies
Bug #5099: Non-swimming enemies will enter water if player is water walking
Feature #1774: Handle AvoidNode Feature #1774: Handle AvoidNode
Feature #2229: Improve pathfinding AI Feature #2229: Improve pathfinding AI
Feature #3025: Analogue gamepad movement controls Feature #3025: Analogue gamepad movement controls

5
apps/openmw/mwmechanics/aicombataction.cpp
View file

@ -422,6 +422,11 @@ namespace MWMechanics
return true; return true;
} }
if (actor.getClass().isPureLandCreature(actor) && MWBase::Environment::get().getWorld()->isWalkingOnWater(enemy))
{
return false;
}
if (actor.getClass().isPureFlyingCreature(actor) || actor.getClass().isPureLandCreature(actor)) if (actor.getClass().isPureFlyingCreature(actor) || actor.getClass().isPureLandCreature(actor))
{ {
if (MWBase::Environment::get().getWorld()->isSwimming(enemy)) if (MWBase::Environment::get().getWorld()->isSwimming(enemy))