just do a basic device unset message for now

Author: HeliumAnt

Source/Managers/UInputMan.cpp

@@ -314,6 +314,10 @@ void UInputMan::DisableMouseMoving(bool disable) {
 	}
 }
 bool UInputMan::CheckMultiMouseKeyboardEnabled(std::optional<std::reference_wrapper<const std::vector<int>>> players) {
+	if (m_ForceDisableMultiMouseKeyboard) {
+		m_EnableMultiMouseKeyboard = false;
+		return false;
+	}
 	int playerMouseControlled{0};
 	if (players) {
 		for (int player: players->get()) {
@@ -707,7 +711,7 @@ bool UInputMan::GetKeyboardButtonState(SDL_Scancode scancodeToTest, InputState w
 
 	std::unordered_map<SDL_KeyboardID, Keyboard>::const_iterator keyboardIterator;
 
-	if (keyboardID == 0 && (playerDevice == InputDevice::DEVICE_KEYB_ONLY || playerDevice == InputDevice::DEVICE_MOUSE_KEYB)) {
+	if (m_EnableMultiMouseKeyboard && keyboardID == 0 && (playerDevice == InputDevice::DEVICE_KEYB_ONLY || playerDevice == InputDevice::DEVICE_MOUSE_KEYB)) {
 		if(playerDevice == InputDevice::DEVICE_KEYB_ONLY) {
 			keyboardID = m_ControlScheme.at(whichPlayer).GetDeviceID().keyboard;
 		} else {
@@ -752,7 +756,7 @@ bool UInputMan::GetMouseButtonState(int whichPlayer, int whichButton, InputState
 
 	std::unordered_map<SDL_MouseID, Mouse>::const_iterator mouseIterator;
 
-	if (mouseID == 0 && (playerDevice == InputDevice::DEVICE_MOUSE_KEYB)) {
+	if (m_EnableMultiMouseKeyboard && mouseID == 0 && (playerDevice == InputDevice::DEVICE_MOUSE_KEYB)) {
 		mouseID = m_ControlScheme.at(whichPlayer).GetDeviceID().mouseKeyboard.mouse;
 	}
 

Source/Menus/ScenarioActivityConfigGUI.cpp

@@ -284,14 +284,18 @@ bool ScenarioActivityConfigGUI::Update(int mouseX, int mouseY) {
 	int maxHumanPlayers = m_SelectedActivity->GetMaxPlayerSupport();
 	int minTeamsRequired = m_SelectedActivity->GetMinTeamsRequired();
 
+	std::vector humanPlayers = GetHumanPlayers();
 	std::string errorMessage = "";
 	if (humansInTeams > maxHumanPlayers) {
 		errorMessage = "Too many players assigned! Max for this activity is " + std::to_string(maxHumanPlayers);
 	} else if (minTeamsRequired > teamsWithPlayers) {
 		errorMessage = "Assign players to at least " + std::to_string(minTeamsRequired) + " of the teams!";
 	} else if (teamWithHumans == 0) {
 		errorMessage = "Assign human players to at least one team!";
+	} else if (g_UInputMan.CheckMultiMouseKeyboardEnabled(humanPlayers) && !g_UInputMan.AllPlayerInputDevicesKnown(humanPlayers)) {
+		errorMessage = "Some players have not set keyboard or mouse devices. Please go to input settings to configure!";
 	}
+
 	m_StartErrorLabel->SetText(errorMessage);
 	m_StartErrorLabel->SetVisible(!errorMessage.empty());
 	m_StartGameButton->SetVisible(errorMessage.empty());
@@ -427,17 +431,10 @@ bool ScenarioActivityConfigGUI::HandleInputEvents() {
 				SetEnabled(false);
 			} else if (guiEvent.GetControl() == m_StartGameButton) {
 				// Make sure all players have known input devices if multimouse is enabled.
-				std::vector humanPlayers = GetHumanPlayers();
-				if (g_UInputMan.CheckMultiMouseKeyboardEnabled(humanPlayers) && g_UInputMan.AllPlayerInputDevicesKnown(humanPlayers)) {
-					g_GUISound.ButtonPressSound()->Play();
-					StartGame();
-					SetEnabled(false);
-					return true;
-				} else {
-					// TODO: Show message and device selection.
-					g_GUISound.UserErrorSound()->Play();
-					return false;
-				}
+				g_GUISound.ButtonPressSound()->Play();
+				StartGame();
+				SetEnabled(false);
+				return true;
 			}
 		} else if (guiEvent.GetType() == GUIEvent::Notification) {
 			if (guiEvent.GetControl() == m_ActivityDifficultySlider) {