-

Author: codenamecpp

src/Pedestrian.cpp

@@ -278,6 +278,26 @@ bool Pedestrian::IsCarDriver() const
     return false;
 }
 
+bool Pedestrian::IsStanding() const
+{
+    ePedestrianState currState = GetCurrentStateID();
+    return (currState == ePedestrianState_StandingStill || currState == ePedestrianState_StandsAndShoots);
+}
+
+bool Pedestrian::IsShooting() const
+{
+    ePedestrianState currState = GetCurrentStateID();
+    return (currState == ePedestrianState_StandsAndShoots || currState == ePedestrianState_WalksAndShoots ||
+        currState == ePedestrianState_RunsAndShoots);
+}
+
+bool Pedestrian::IsWalking() const
+{
+    ePedestrianState currState = GetCurrentStateID();
+    return (currState == ePedestrianState_Walks || currState == ePedestrianState_Runs || 
+        currState == ePedestrianState_WalksAndShoots || currState == ePedestrianState_RunsAndShoots);
+}
+
 void Pedestrian::HandleCarEntered()
 {
     debug_assert(mCurrentCar);

src/Pedestrian.h

@@ -58,6 +58,11 @@ class Pedestrian final: public GameObject
     bool IsCarPassenger() const;
     bool IsCarDriver() const;
 
+    // check if pedestrian is in specific state
+    bool IsStanding() const;
+    bool IsShooting() const;
+    bool IsWalking() const;
+
     // detects identifier of current pedestrian state
     ePedestrianState GetCurrentStateID() const;
 

src/PedestrianStates.cpp

@@ -150,6 +150,9 @@ void PedestrianStateIdleBase::ProcessStateFrame(Pedestrian* pedestrian, Timespan
         return;
     }
 
+    if (!CanInterrupCurrentIdleAnim(pedestrian))
+        return;
+
     ProcessRotateActions(pedestrian, deltaTime);
     ProcessMotionActions(pedestrian, deltaTime);
 
@@ -198,12 +201,25 @@ void PedestrianStateIdleBase::ProcessStateFrame(Pedestrian* pedestrian, Timespan
 
 void PedestrianStateIdleBase::ProcessStateEvent(Pedestrian* pedestrian, const PedestrianStateEvent& stateEvent)
 {
+    if (!CanInterrupCurrentIdleAnim(pedestrian))
+        return;
+
     if (stateEvent.mID == ePedestrianStateEvent_ActionEnterCar)
     {
         pedestrian->ChangeState(&pedestrian->mStateEnterCar, &stateEvent);
     }
 }
 
+bool PedestrianStateIdleBase::CanInterrupCurrentIdleAnim(Pedestrian* pedestrian) const
+{
+    if (pedestrian->IsStanding() && pedestrian->IsShooting())
+    {
+        return pedestrian->mCurrentAnimState.IsLastFrame() || 
+            !pedestrian->mCurrentAnimState.IsAnimationActive();
+    }
+    return true;
+}
+
 //////////////////////////////////////////////////////////////////////////
 
 void PedestrianStateStandingStill::ProcessStateEnter(Pedestrian* pedestrian, const PedestrianStateEvent* transitionEvent)

src/PedestrianStates.h

@@ -82,6 +82,9 @@ class PedestrianStateIdleBase: public PedestrianBaseState
     PedestrianStateIdleBase(ePedestrianState stateIdentifier) : PedestrianBaseState(stateIdentifier) {}
     void ProcessStateFrame(Pedestrian* pedestrian, Timespan deltaTime) override;
     void ProcessStateEvent(Pedestrian* pedestrian, const PedestrianStateEvent& stateEvent) override;
+
+protected:
+    bool CanInterrupCurrentIdleAnim(Pedestrian* pedestrian) const;
 };
 
 // process state ePedestrianState_StandingStill

src/SpriteAnimation.cpp

@@ -90,6 +90,11 @@ void SpriteAnimation::StopAnimation()
     mStatus = eSpriteAnimStatus_Stop;
 }
 
+void SpriteAnimation::StopAnimationAtEnd()
+{
+    mLoopMode = eSpriteAnimLoop_None;
+}
+
 void SpriteAnimation::RewindToStart()
 {
     mFrameCursor = 0;

src/SpriteAnimation.h

@@ -71,6 +71,7 @@ class SpriteAnimation
     // animation control
 
     void StopAnimation();
+    void StopAnimationAtEnd(); // disable current loop mode
 
     // play animation from current position
     void PlayAnimation(eSpriteAnimLoop animLoop);