Added settings flag and support for experimental multiplayer speedboosts based on topkek's changes

These changes are on by default

Author: garethyr

Managers/NetworkClient.cpp

@@ -283,7 +283,7 @@ namespace RTE {
 			return;
 		}
 
-		DrawFrame();
+		if (!g_SettingsMan.UseExperimentalMultiplayerSpeedboosts()) { DrawFrame(); }
 
 		m_PostEffects[m_CurrentFrame].clear();
 		m_CurrentFrame = frameData->FrameNumber;
@@ -1005,7 +1005,10 @@ namespace RTE {
 
 		if (static_cast<double>((currentTicks - m_LastInputSentTime)) / static_cast<double>(g_TimerMan.GetTicksPerSecond()) > 1.0 / inputSend) {
 			m_LastInputSentTime = g_TimerMan.GetRealTickCount();
-			if (IsConnectedAndRegistered()) { SendInputMsg(); }
+			if (IsConnectedAndRegistered()) {
+				if (g_SettingsMan.UseExperimentalMultiplayerSpeedboosts()) { DrawFrame(); }
+				SendInputMsg();
+			}
 		}
 	}
 

Managers/NetworkServer.cpp

@@ -1154,15 +1154,19 @@ namespace RTE {
 	int NetworkServer::SendFrame(short player) {
 		long long currentTicks = g_TimerMan.GetRealTickCount();
 		double fps = static_cast<double>(m_EncodingFps);
-		double secsPerFrame = 1.0 / fps;
-		double secsSinceLastFrame = static_cast<double>(currentTicks - m_LastFrameSentTime[player]) / static_cast<double>(g_TimerMan.GetTicksPerSecond());
+		if (g_SettingsMan.UseExperimentalMultiplayerSpeedboosts()) {
+			RakSleep(1000 / fps);
+		} else {
+			double secsPerFrame = 1.0 / fps;
+			double secsSinceLastFrame = static_cast<double>(currentTicks - m_LastFrameSentTime[player]) / static_cast<double>(g_TimerMan.GetTicksPerSecond());
 
-		// Fix for an overflow which may happen if server lags for a few seconds when loading activities
-		if (secsSinceLastFrame < 0) { secsSinceLastFrame = secsPerFrame; }
+			// Fix for an overflow which may happen if server lags for a few seconds when loading activities
+			if (secsSinceLastFrame < 0) { secsSinceLastFrame = secsPerFrame; }
 
-		m_MsecPerFrame[player] = static_cast<int>(secsSinceLastFrame * 1000.0);
+			m_MsecPerFrame[player] = static_cast<int>(secsSinceLastFrame * 1000.0);
 
-		m_LastFrameSentTime[player] = g_TimerMan.GetRealTickCount();
+			m_LastFrameSentTime[player] = g_TimerMan.GetRealTickCount();
+		}
 
 		// Wait till FrameMan releases bitmap
 		SetThreadExitReason(player, NetworkServer::LOCKED);
@@ -1448,8 +1452,10 @@ namespace RTE {
 		}
 		ProcessTerrainChanges(player);
 
-		double secsSinceSendStart = static_cast<double>(g_TimerMan.GetRealTickCount() - currentTicks) / static_cast<double>(g_TimerMan.GetTicksPerSecond());
-		m_MsecPerSendCall[player] = static_cast<int>(secsSinceSendStart * 1000.0);
+		if (!g_SettingsMan.UseExperimentalMultiplayerSpeedboosts()) {
+			double secsSinceSendStart = static_cast<double>(g_TimerMan.GetRealTickCount() - currentTicks) / static_cast<double>(g_TimerMan.GetTicksPerSecond());
+			m_MsecPerSendCall[player] = static_cast<int>(secsSinceSendStart * 1000.0);
+		}
 
 		SetThreadExitReason(player, NetworkServer::NORMAL);
 		return 0;

Managers/SettingsMan.cpp

@@ -34,6 +34,7 @@ namespace RTE {
 		m_NATServiceAddress = "127.0.0.1:61111";
 		m_NATServerName = "DefaultServerName";
 		m_NATServerPassword = "DefaultServerPassword";
+		m_UseExperimentalMultiplayerSpeedboosts = true;
 
 		m_AllowSavingToBase = false;
 		m_ShowForeignItems = true;
@@ -226,6 +227,8 @@ namespace RTE {
 			reader >> m_NATServerName;
 		} else if (propName == "NATServerPassword") {
 			reader >> m_NATServerPassword;
+		} else if (propName == "UseExperimentalMultiplayerSpeedboosts") {
+			reader >> m_UseExperimentalMultiplayerSpeedboosts;
 		} else if (propName == "ClientInputFps") {
 			reader >> g_NetworkClient.m_ClientInputFps;
 		} else if (propName == "ServerTransmitAsBoxes") {
@@ -390,6 +393,7 @@ namespace RTE {
 		writer.NewPropertyWithValue("NATServiceAddress", m_NATServiceAddress);
 		writer.NewPropertyWithValue("NATServerName", m_NATServerName);
 		writer.NewPropertyWithValue("NATServerPassword", m_NATServerPassword);
+		writer.NewPropertyWithValue("UseExperimentalMultiplayerSpeedboosts", m_UseExperimentalMultiplayerSpeedboosts);
 
 		writer.NewLine(false, 2);
 		writer.NewDivider(false);

Managers/SettingsMan.h

@@ -252,6 +252,18 @@ namespace RTE {
 		/// </summary>
 		/// <param name="newValue">New password to use when connecting via NAT punch-through service.</param>
 		void SetNATServerPassword(const std::string &newValue) { m_NATServerPassword = newValue.empty() ? "DefaultServerPassword" : newValue; }
+
+		/// <summary>
+		/// Gets whether or not experimental multiplayer speedboosts should be used.
+		/// </summary>
+		/// <returns>Whether or not experimental multiplayer speedboosts should be used.</returns>
+		bool UseExperimentalMultiplayerSpeedboosts() const { return m_UseExperimentalMultiplayerSpeedboosts; }
+
+		/// <summary>
+		/// Sets whether or not experimental multiplayer speedboosts should be used.
+		/// </summary>
+		/// <param name="newValue">Whether or not experimental multiplayer speedboosts should be used.</param>
+		void SetUseExperimentalMultiplayerSpeedboosts(bool newValue) { m_UseExperimentalMultiplayerSpeedboosts = newValue; }
 #pragma endregion
 
 #pragma region Editor Settings
@@ -438,6 +450,7 @@ namespace RTE {
 		std::string m_NATServiceAddress; //!< NAT punch-through server address.
 		std::string m_NATServerName; //!< Server name to use when connecting via NAT punch-through service.
 		std::string m_NATServerPassword; //!< Server password to use when connecting via NAT punch-through service.
+		bool m_UseExperimentalMultiplayerSpeedboosts; //!< Turns on/off code changes from topkek that may speed up multiplayer.
 
 		bool m_AllowSavingToBase; //!< Whether editors will allow to select Base.rte as a module to save in.
 		bool m_ShowMetaScenes; //!< Show MetaScenes in editors and activities.