Fixed phantom screenshake when launching/restarting activities sometimes

Author: garethyr

Entities/Activity.cpp

@@ -316,8 +316,8 @@ void Activity::Clear() {
 			if (int screenId = ScreenOfPlayer(player); screenId != -1) {
 				g_FrameMan.ClearScreenText(screenId);
 				g_CameraMan.SetScreenOcclusion(Vector(), screenId);
-				g_CameraMan.SetScreenShake(0.0F, screenId);
 			}
+			g_CameraMan.ResetAllScreenShake();
 
 			//TODO currently this sets brains to players arbitrarily. We should save information on which brain is for which player in the scene so we can set them properly!
 			if (m_IsActive[player]) {

Managers/ActivityMan.cpp

@@ -293,11 +293,6 @@ namespace RTE {
 		// Stop all music played by the current activity. It will be re-started by the new Activity.
 		g_AudioMan.StopMusic();
 
-		// Reset screen positions and shake
-		for (int screen = 0; screen < c_MaxScreenCount; screen++) {
-			g_CameraMan.SetScreenShake(0, screen);
-		}
-
 		m_ActivityAllowsSaving = false;
 
 		m_StartActivity.reset(activity);

Managers/CameraMan.cpp

@@ -171,6 +171,16 @@ namespace RTE {
 		return Vector(static_cast<float>(frameWidth), static_cast<float>(frameHeight));
 	}
 
+/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+	void CameraMan::ResetAllScreenShake() {
+		for (int screenId = 0; screenId < g_FrameMan.GetScreenCount(); ++screenId) {
+			Screen &screen = m_Screens[screenId];
+			screen.ScreenShakeMagnitude = 0;
+			screen.ScrollTimer.Reset();
+		}
+	}
+
 /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
 	void CameraMan::AddScreenShake(float magnitude, const Vector &position) {

Managers/CameraMan.h

@@ -200,6 +200,11 @@ namespace RTE {
 #pragma endregion
 
 #pragma region Screen Shake Actions
+		/// <summary>
+		/// Resets all screen shake and the screen scroll timers that affect it.
+		/// </summary>
+		void ResetAllScreenShake();
+
 		/// <summary>
 		/// Increases the magnitude of screen shake.
 		/// This is used for spatially located screen-shake, and will automatically determine which screens have shake applied