Fixed activity set to restart not working properly cause the game tried to go back to the menu

Made multiplayer end activity voting also have a timeout interval so things work properly

Author: garethyr

Main.cpp

@@ -235,7 +235,7 @@ namespace RTE {
 					g_TimerMan.PauseSim(true);
 					if (g_MetaMan.GameInProgress()) {
 						g_MenuMan.GetTitleScreen()->SetTitleTransitionState(TitleScreen::TitleTransition::MetaGameFadeIn);
-					} else {
+					} else if (!g_ActivityMan.ActivitySetToRestart()) {
 						const Activity *activity = g_ActivityMan.GetActivity();
 						// If we edited something then return to main menu instead of scenario menu.
 						if (activity && activity->GetPresetName() == "None") {
@@ -244,7 +244,7 @@ namespace RTE {
 							g_MenuMan.GetTitleScreen()->SetTitleTransitionState(TitleScreen::TitleTransition::ScenarioFadeIn);
 						}
 					}
-					RunMenuLoop();
+					if (!g_ActivityMan.ActivitySetToRestart()) { RunMenuLoop(); }
 				}
 				if (g_ActivityMan.ActivitySetToRestart() && !g_ActivityMan.RestartActivity()) {
 					break;

Managers/NetworkServer.cpp

@@ -1655,8 +1655,14 @@ namespace RTE {
 				for (short player = 0; player < c_MaxClients; player++) {
 					if (IsPlayerConnected(player)) {
 						votesNeeded++;
-						if (m_EndActivityVotes[player]) { endActivityVotes++; }
-						if (m_RestartActivityVotes[player]) { restartVotes++; }
+						if (m_EndActivityVotes[player]) {
+							endActivityVotes++;
+							m_EndActivityVotes[player] = false;
+						}
+						if (m_RestartActivityVotes[player]) {
+							restartVotes++;
+							m_RestartActivityVotes[player] = false;
+						}
 					}
 				}
 
@@ -1676,22 +1682,22 @@ namespace RTE {
 						g_ActivityMan.GetActivity()->ResetMessageTimer(i);
 					}
 
-					// establish timer so restarts can only occur once per 5 seconds
+					// establish timer so restarts can only occur once per 3 seconds
 					long long currentTicks = g_TimerMan.GetRealTickCount();
-					int minRestartInterval = 5;
-
-					if (endActivityVotes >= votesNeeded) {
-						g_ActivityMan.EndActivity();
-						g_ActivityMan.SetRestartActivity();
-						g_ActivityMan.SetInActivity(false);
-					} else if (restartVotes >= votesNeeded && ((currentTicks - m_LatestRestartTime > (g_TimerMan.GetTicksPerSecond() * minRestartInterval) || m_LatestRestartTime == 0))) {
-						m_LatestRestartTime = currentTicks;
-						g_ActivityMan.RestartActivity();
-					}
-
-					for (short player = 0; player < c_MaxClients; player++) {
-						m_EndActivityVotes[player] = false;
-						m_RestartActivityVotes[player] = false;
+					int minRestartInterval = 3;
+
+					if ((currentTicks - m_LatestRestartTime > (g_TimerMan.GetTicksPerSecond() * minRestartInterval)) || m_LatestRestartTime == 0) {
+						if (endActivityVotes >= votesNeeded) {
+							m_LatestRestartTime = currentTicks;
+							g_ActivityMan.EndActivity();
+							g_ActivityMan.SetRestartActivity();
+							g_ActivityMan.SetInActivity(false);
+							for (short player = 0; player < c_MaxClients; player++) { ClearInputMessages(player); }
+						} else if (restartVotes >= votesNeeded) {
+							m_LatestRestartTime = currentTicks;
+							g_ActivityMan.RestartActivity();
+							for (short player = 0; player < c_MaxClients; player++) { ClearInputMessages(player); }
+						}
 					}
 				}
 			}