Merge pull request #217 from cortex-command-community/remove-multiplayer-ui

Removed Multiplayer UI

Author: Causeless

CHANGELOG.md

@@ -260,13 +260,15 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 <details><summary><b>Removed</b></summary>
 
+- Removed multiplayer. The existing multiplayer implementation was terrible and broken, and can be done better with multiple keyboard+mouse support plus an external client like Parsec or Steam Remote Play Together. In future, we will investigate whether it's feasible to build in a proper and more capable multiplayer solution.
+
 - All music-related functionality from AudioMan has been removed due to the addition of the MusicMan. Generic DynamicSongs have been put in to use instead.
 	Mod activities that used to queue up all the vanilla music should now instead call, for example, `MusicMan:PlayDynamicSong("Generic Battle Music")`
 
 - The Signal Hunt activity no longer has a preview image, as it was not formatted correctly and spoiled the interior structure of the cave.
 
-- Removed `GAScripted` Lua script method `SceneTest()` as the new Lua function `IsCompatibleScene(scene)` is more capable.
-	Removed `GAScripted` C++ functionality that would scan the  Lua script file to determine which areas are required. `AddRequiredArea` in the INI should be used instead.
+- Removed `GAScripted` Lua script method `SceneTest()` as the new Lua function `IsCompatibleScene(scene)` is more capable.  
+	Removed `GAScripted` C++ functionality that would scan the Lua script file to determine which areas are required. `AddRequiredArea` in the INI should be used instead.  
 	Removed `Scene` Lua function `GetOptionalArea` as it functioned identically to `GetArea` aside from triggering the aforementioned (and now removed) Lua script file scanning.
 
 - Removed `AHuman` property `MaxCrouchRotation`. `CrouchRotAngleTarget` is now used instead.

Data/Base.rte/GUIs/MainMenuGUI.ini

@@ -57,24 +57,11 @@ Name = ButtonMainToSkirmish
 Anchor = Left, Top
 Text = Scenario Battle
 
-[ButtonMainToMultiplayer]
-ControlType = BUTTON
-Parent = MainScreen
-X = 0
-Y = 40
-Width = 240
-Height = 20
-Visible = True
-Enabled = True
-Name = ButtonMainToMultiplayer
-Anchor = Left, Top
-Text = Online Multiplayer
-
 [ButtonSaveOrLoadGame]
 ControlType = BUTTON
 Parent = MainScreen
 X = 0
-Y = 60
+Y = 40
 Width = 240
 Height = 20
 Visible = True
@@ -87,7 +74,7 @@ Text = Saved Games
 ControlType = BUTTON
 Parent = MainScreen
 X = 0
-Y = 80
+Y = 60
 Width = 110
 Height = 20
 Visible = True
@@ -100,7 +87,7 @@ Text = Settings
 ControlType = BUTTON
 Parent = MainScreen
 X = 0
-Y = 100
+Y = 80
 Width = 160
 Height = 20
 Visible = True
@@ -113,7 +100,7 @@ Text = Mod Manager
 ControlType = BUTTON
 Parent = MainScreen
 X = 0
-Y = 120
+Y = 100
 Width = 170
 Height = 20
 Visible = True
@@ -126,7 +113,7 @@ Text = Game Editors
 ControlType = BUTTON
 Parent = MainScreen
 X = 0
-Y = 140
+Y = 120
 Width = 100
 Height = 20
 Visible = True
@@ -139,7 +126,7 @@ Text = Credits
 ControlType = BUTTON
 Parent = MainScreen
 X = 0
-Y = 160
+Y = 140
 Width = 55
 Height = 20
 Visible = True
@@ -152,7 +139,7 @@ Text = Exit
 ControlType = BUTTON
 Parent = MainScreen
 X = 0
-Y = 180
+Y = 160
 Width = 200
 Height = 20
 Visible = True

Data/Base.rte/Scenes.ini

@@ -346,11 +346,6 @@ AddScene = Scene
 	PresetName = Editor Scene
 
 
-AddScene = Scene
-	CopyOf = Null Scene
-	PresetName = Multiplayer Scene
-
-
 ///////////////////////////////////////////////////////////////////////
 // Scenes
 

Source/Menus/MainMenuGUI.cpp

@@ -92,7 +92,6 @@ void MainMenuGUI::CreateMainScreen() {
 
 	m_MainMenuButtons[MenuButton::MetaGameButton] = dynamic_cast<GUIButton*>(m_MainMenuScreenGUIControlManager->GetControl("ButtonMainToMetaGame"));
 	m_MainMenuButtons[MenuButton::ScenarioButton] = dynamic_cast<GUIButton*>(m_MainMenuScreenGUIControlManager->GetControl("ButtonMainToSkirmish"));
-	m_MainMenuButtons[MenuButton::MultiplayerButton] = dynamic_cast<GUIButton*>(m_MainMenuScreenGUIControlManager->GetControl("ButtonMainToMultiplayer"));
 	m_MainMenuButtons[MenuButton::SaveOrLoadGameButton] = dynamic_cast<GUIButton*>(m_MainMenuScreenGUIControlManager->GetControl("ButtonSaveOrLoadGame"));
 	m_MainMenuButtons[MenuButton::SettingsButton] = dynamic_cast<GUIButton*>(m_MainMenuScreenGUIControlManager->GetControl("ButtonMainToOptions"));
 	m_MainMenuButtons[MenuButton::ModManagerButton] = dynamic_cast<GUIButton*>(m_MainMenuScreenGUIControlManager->GetControl("ButtonMainToModManager"));
@@ -423,9 +422,6 @@ void MainMenuGUI::HandleMainScreenInputEvents(const GUIControl* guiEventControl)
 		}
 	} else if (guiEventControl == m_MainMenuButtons[MenuButton::ScenarioButton]) {
 		m_UpdateResult = MainMenuUpdateResult::ScenarioStarted;
-	} else if (guiEventControl == m_MainMenuButtons[MenuButton::MultiplayerButton]) {
-		m_UpdateResult = MainMenuUpdateResult::ActivityStarted;
-		g_GUISound.BackButtonPressSound()->Play();
 	} else if (guiEventControl == m_MainMenuButtons[MenuButton::SaveOrLoadGameButton]) {
 		SetActiveMenuScreen(MenuScreen::SaveOrLoadGameScreen);
 	} else if (guiEventControl == m_MainMenuButtons[MenuButton::SettingsButton]) {

Source/Menus/MainMenuGUI.h

@@ -74,7 +74,6 @@ namespace RTE {
 		enum MenuButton {
 			MetaGameButton,
 			ScenarioButton,
-			MultiplayerButton,
 			SaveOrLoadGameButton,
 			SettingsButton,
 			ModManagerButton,

Source/System/GameVersion.h

@@ -5,7 +5,7 @@
 namespace RTE {
 
 #pragma region Game Version
-	static constexpr const char* c_VersionString = "6.2.2";
+	static constexpr const char* c_VersionString = "7.0.0";
 	static const version::Semver200_version c_GameVersion = version::Semver200_version(c_VersionString);
 #pragma endregion
 } // namespace RTE