unhide cursor in server mode and prevent server from stealing the cursor on sudden client disconnect while in activity

Author: HeliumAnt

Main.cpp

@@ -376,6 +376,10 @@ int main(int argc, char **argv) {
 
 	HandleMainArgs(argc, argv);
 
+	if (g_NetworkServer.IsServerModeEnabled()) {
+		SDL_ShowCursor(SDL_ENABLE);
+	}
+
 	g_PresetMan.LoadAllDataModules();
 
 	if (!System::IsInExternalModuleValidationMode()) {

Managers/UInputMan.cpp

@@ -370,7 +370,7 @@ namespace RTE {
 /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
 	void UInputMan::TrapMousePos(bool trap, int whichPlayer) {
-		if (whichPlayer == Players::NoPlayer || m_ControlScheme.at(whichPlayer).GetDevice() == InputDevice::DEVICE_MOUSE_KEYB) {
+		if (!IsInMultiplayerMode() && (whichPlayer == Players::NoPlayer || m_ControlScheme.at(whichPlayer).GetDevice() == InputDevice::DEVICE_MOUSE_KEYB)) {
 			m_TrapMousePos = trap;
 			SDL_SetRelativeMouseMode(static_cast<SDL_bool>(trap));
 		}

Managers/WindowMan.cpp

@@ -540,6 +540,9 @@ namespace RTE {
 /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
 	void WindowMan::QueueWindowEvent(const SDL_Event &windowEvent) {
+		if (g_UInputMan.IsInMultiplayerMode()) {
+			return;
+		}
 		m_EventQueue.emplace_back(windowEvent);
 	}