Changed: #1469 Making sure animation cannot be played if the player is dead

--HG--
branch : gsoc2012-fabien

code/ryzom/client/src/camera_animation_manager/camera_animation_player.cpp

@@ -48,6 +48,10 @@ void CCameraAnimationPlayer::start()
 	if (isPlaying())
 		stop();
 
+	// If the player is dead, we do nothing
+	if (UserControls.mode() == CUserControls::DeathMode)
+		return;
+
 	_IsPlaying = true;
 
 	// We set the user controls in camAnimMode and we remember the current view and viewPos
@@ -58,8 +62,11 @@ void CCameraAnimationPlayer::start()
 	_HasLastViewInfo = true;
 }
 
-void CCameraAnimationPlayer::stop()
+void CCameraAnimationPlayer::stop(bool interrupt)
 {
+	if (!isPlaying())
+		return;
+
 	_IsPlaying = false;
 
 	stopStep();
@@ -67,7 +74,8 @@ void CCameraAnimationPlayer::stop()
 	// We reset view and viewPos and the usercontrols mode
 	if (_HasLastViewInfo)
 	{
-		UserControls.mode(_LastMode);
+		if (!interrupt)
+			UserControls.mode(_LastMode);
 		View.view(_LastView);
 		View.viewPos(_LastViewPos);
 		_HasLastViewInfo = false;

code/ryzom/client/src/camera_animation_manager/camera_animation_player.h

@@ -58,7 +58,7 @@ public:
 	void start();
 
 	/// Stops an animation
-	void stop();
+	void stop(bool interrupt = false);
 
 	/// Loads and play the specified step
 	void playStep(const std::string& stepName, NLMISC::CBitMemStream& impulse);

code/ryzom/client/src/motion/modes/cam_anim_mode.cpp

@@ -69,7 +69,10 @@ void CUserControls::camAnimModeStart()
 //-----------------------------------------------
 void CUserControls::camAnimModeStop()
 {
-
+	// We tell the camera animation player to stop (by interruption)
+	// If the camera animation player was not playing any animation it will have no effect but this function
+	// is usefull if the mode has changed (player is dead) to interrupt the animation
+	CCameraAnimationPlayer::getInstance()->stop(true);
 }// camAnimModeStop //
 
 //-----------------------------------------------