Merge branch 'main' into TU43

Minecraft.Client/Windows64/KeyboardMouseInput.cpp

@@ -390,6 +390,20 @@ float KeyboardMouseInput::GetLookY(float sensitivity) const
 	return static_cast<float>(-m_mouseDeltaY) * sensitivity;
 }
 
+void KeyboardMouseInput::SetCursorIcon(LPCWSTR cursorName) 
+{
+	HCURSOR hCursor = LoadCursorW(nullptr, cursorName);
+	if (hCursor)
+	{
+		SetCursor(hCursor);
+
+		if (g_hWnd)
+		{
+			SetClassLongPtrW(g_hWnd, GCLP_HCURSOR, (LONG_PTR)hCursor);
+		}
+	}
+}
+
 void KeyboardMouseInput::OnChar(wchar_t c)
 {
 	int next = (m_charBufferHead + 1) % CHAR_BUFFER_SIZE;

Minecraft.Client/Windows64/KeyboardMouseInput.h

@@ -104,6 +104,8 @@ public:
 	float GetLookX(float sensitivity) const;
 	float GetLookY(float sensitivity) const;
 
+	void SetCursorIcon(LPCWSTR cursorName);
+
 private:
 	bool m_keyDown[MAX_KEYS];
 	bool m_keyDownPrev[MAX_KEYS];

Minecraft.Client/Windows64/Network/WinsockNetLayer.cpp

@@ -115,6 +115,7 @@ bool WinsockNetLayer::s_clientKeyStored = false;
 
 bool g_Win64MultiplayerHost = false;
 bool g_Win64MultiplayerJoin = false;
+bool g_Win64MultiplayerQuitOnDisconnect = false;
 int g_Win64MultiplayerPort = WIN64_NET_DEFAULT_PORT;
 char g_Win64MultiplayerIP[256] = "127.0.0.1";
 bool g_Win64DedicatedServer = false;

Minecraft.Client/Windows64/Network/WinsockNetLayer.h

@@ -227,6 +227,7 @@ public:
 
 extern bool g_Win64MultiplayerHost;
 extern bool g_Win64MultiplayerJoin;
+extern bool g_Win64MultiplayerQuitOnDisconnect;
 extern int g_Win64MultiplayerPort;
 extern char g_Win64MultiplayerIP[256];
 extern bool g_Win64DedicatedServer;

Minecraft.Client/Windows64/Windows64_Minecraft.cpp

@@ -219,6 +219,7 @@ static Win64LaunchOptions ParseLaunchOptions()
 	Win64LaunchOptions options = {};
 	options.screenMode = 0;
 
+	g_Win64MultiplayerQuitOnDisconnect = false;
 	g_Win64MultiplayerJoin = false;
 	g_Win64MultiplayerPort = WIN64_NET_DEFAULT_PORT;
 
@@ -239,6 +240,10 @@ static Win64LaunchOptions ParseLaunchOptions()
 		{
 			CopyWideArgToAnsi(argv[++i], g_Win64Username, sizeof(g_Win64Username));
 		}
+		else if (_wcsicmp(argv[i], L"-quitondisconnect") == 0)
+		{
+			g_Win64MultiplayerQuitOnDisconnect = true;
+		}
 		else if (_wcsicmp(argv[i], L"-ip") == 0 && (i + 1) < argc)
 		{
 			char ipBuf[256];
@@ -1759,9 +1764,7 @@ int APIENTRY _tWinMain(_In_ HINSTANCE hInstance,
 		return 1;
 	}
 	g_bResizeReady = true;
-
-	ui.ReloadSkin();
-
+	
 	//app.TemporaryCreateGameStart();
 
 	//Sleep(10000);