Attempt to select an AI action directly instead of waiting for the next frame

apps/openmw/mwmechanics/aiwander.cpp

@@ -454,28 +454,38 @@ namespace MWMechanics
 
     void AiWander::doPerFrameActionsForState(const MWWorld::Ptr& actor, float duration,
         MWWorld::MovementDirectionFlags supportedMovementDirections, AiWanderStorage& storage)
+    {
+        // Attempt to fast forward to the next state instead of remaining in an intermediate state for a frame
+        for (int i = 0; i < 2; ++i)
         {
             switch (storage.mState)
             {
                 case AiWanderStorage::Wander_IdleNow:
+                {
                     onIdleStatePerFrameActions(actor, duration, storage);
-                break;
+                    if (storage.mState != AiWanderStorage::Wander_ChooseAction)
-
+                        return;
+                    continue;
+                }
                 case AiWanderStorage::Wander_Walking:
                     onWalkingStatePerFrameActions(actor, duration, supportedMovementDirections, storage);
-                break;
+                    return;
 
                 case AiWanderStorage::Wander_ChooseAction:
+                {
                     onChooseActionStatePerFrameActions(actor, storage);
-                break;
+                    if (storage.mState != AiWanderStorage::Wander_IdleNow)
-
+                        return;
+                    continue;
+                }
                 case AiWanderStorage::Wander_MoveNow:
-                break; // nothing to do
+                    return; // nothing to do
 
                 default:
                     // should never get here
                     assert(false);
-                break;
+                    return;
+            }
         }
     }