fix #42

codenamecpp · codenamecpp · commit 44957c318f1b · 2020-08-27T09:15:17.000+03:00
diff --git a/src/PedestrianStates.cpp b/src/PedestrianStates.cpp
@@ -752,16 +752,20 @@ bool PedestrianStatesManager::StateFalling_ProcessEvent(const PedestrianStateEve
 
 void PedestrianStatesManager::StateIdle_ProcessFrame()
 {
+    const PedestrianCtlState& ctlState = mPedestrian->mCtlState;
+
     if (mPedestrian->IsShooting())
     {
-        TryToShoot();
+        // pedestrian is in shooting state but does he really want to shoot?
+        if (ctlState.mCtlActions[ePedestrianAction_Shoot])
+        {
+            TryToShoot();
+        } 
     }
 
     ProcessRotateActions();
     ProcessMotionActions();
 
-    const PedestrianCtlState& ctlState = mPedestrian->mCtlState;
-
     // slide over car
     if (ctlState.mCtlActions[ePedestrianAction_Run] || ctlState.mCtlActions[ePedestrianAction_WalkForward])
     {

Original file line number	Diff line number	Diff line change
`@@ -752,16 +752,20 @@ bool PedestrianStatesManager::StateFalling_ProcessEvent(const PedestrianStateEve`
`752`	`752`
`753`	`753`	`void PedestrianStatesManager::StateIdle_ProcessFrame()`
`754`	`754`	`{`
	`755`	`+ const PedestrianCtlState& ctlState = mPedestrian->mCtlState;`
	`756`	`+`
`755`	`757`	`if (mPedestrian->IsShooting())`
`756`	`758`	`{`
`757`		`- TryToShoot();`
	`759`	`+ // pedestrian is in shooting state but does he really want to shoot?`
	`760`	`+ if (ctlState.mCtlActions[ePedestrianAction_Shoot])`
	`761`	`+ {`
	`762`	`+ TryToShoot();`
	`763`	`+ }`
`758`	`764`	`}`
`759`	`765`
`760`	`766`	`ProcessRotateActions();`
`761`	`767`	`ProcessMotionActions();`
`762`	`768`
`763`		`- const PedestrianCtlState& ctlState = mPedestrian->mCtlState;`
`764`		`-`
`765`	`769`	`// slide over car`
`766`	`770`	`if (ctlState.mCtlActions[ePedestrianAction_Run] \|\| ctlState.mCtlActions[ePedestrianAction_WalkForward])`
`767`	`771`	`{`