1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-04-01 12:36:42 +00:00

Merge remote-tracking branch 'dteviot/FixRunningInCircles'

This commit is contained in:
Marc Zinnschlag 2015-06-22 15:20:58 +02:00
commit 83961e9109

View file

@ -651,9 +651,6 @@ namespace MWMechanics
if (mAllowedNodes.empty()) if (mAllowedNodes.empty())
return; return;
if (actor.getClass().isPureWaterCreature(actor))
return;
state.moveIn(new AiWanderStorage()); state.moveIn(new AiWanderStorage());
int index = OEngine::Misc::Rng::rollDice(mAllowedNodes.size()); int index = OEngine::Misc::Rng::rollDice(mAllowedNodes.size());
@ -700,7 +697,8 @@ namespace MWMechanics
// actor can wander from the spawn position. AiWander assumes that // actor can wander from the spawn position. AiWander assumes that
// pathgrid points are available, and uses them to randomly select wander // pathgrid points are available, and uses them to randomly select wander
// destinations within the allowed set of pathgrid points (nodes). // destinations within the allowed set of pathgrid points (nodes).
if(mDistance) // ... pathgrids don't usually include water, so swimmers ignore them
if (mDistance && !actor.getClass().isPureWaterCreature(actor))
{ {
float cellXOffset = 0; float cellXOffset = 0;
float cellYOffset = 0; float cellYOffset = 0;