Revert "Win64: configurable username (username.txt) and persistent game setti…" (#234)

This reverts commit b8a7f816b52775fdcfb3503f0000accb8cd65765.

5 files changed, 8 insertions, 132 deletions

diff --git a/Minecraft.Client/Common/Consoles_App.cpp b/Minecraft.Client/Common/Consoles_App.cpp
index b476ca90..0e02ab40 100644
--- a/Minecraft.Client/Common/Consoles_App.cpp
+++ b/Minecraft.Client/Common/Consoles_App.cpp
@@ -760,43 +760,6 @@ bool CMinecraftApp::LoadBeaconMenu(int iPad ,shared_ptr<Inventory> inventory, sh
 //////////////////////////////////////////////
 // GAME SETTINGS
 //////////////////////////////////////////////
-
-#ifdef _WINDOWS64
-static void Win64_GetSettingsPath(char *outPath, DWORD size)
-{
-    GetModuleFileNameA(NULL, outPath, size);
-    char *lastSlash = strrchr(outPath, '\\');
-    if (lastSlash) *(lastSlash + 1) = '\0';
-    strncat_s(outPath, size, "settings.dat", _TRUNCATE);
-}
-static void Win64_SaveSettings(GAME_SETTINGS *gs)
-{
-    if (!gs) return;
-    char filePath[MAX_PATH] = {};
-    Win64_GetSettingsPath(filePath, MAX_PATH);
-    FILE *f = NULL;
-    if (fopen_s(&f, filePath, "wb") == 0 && f)
-    {
-        fwrite(gs, sizeof(GAME_SETTINGS), 1, f);
-        fclose(f);
-    }
-}
-static void Win64_LoadSettings(GAME_SETTINGS *gs)
-{
-    if (!gs) return;
-    char filePath[MAX_PATH] = {};
-    Win64_GetSettingsPath(filePath, MAX_PATH);
-    FILE *f = NULL;
-    if (fopen_s(&f, filePath, "rb") == 0 && f)
-    {
-        GAME_SETTINGS temp = {};
-        if (fread(&temp, sizeof(GAME_SETTINGS), 1, f) == 1)
-            memcpy(gs, &temp, sizeof(GAME_SETTINGS));
-        fclose(f);
-    }
-}
-#endif
-
 void CMinecraftApp::InitGameSettings()
 {
 	for(int i=0;i<XUSER_MAX_COUNT;i++)
@@ -817,8 +780,6 @@ void CMinecraftApp::InitGameSettings()
 		// clear this for now - it will come from reading the system values
 		memset(pProfileSettings,0,sizeof(C_4JProfile::PROFILESETTINGS));
 		SetDefaultOptions(pProfileSettings,i);
-		Win64_LoadSettings(GameSettingsA[i]);
-		ApplyGameSettingsChanged(i);
 #elif defined __PS3__ || defined __ORBIS__ || defined _DURANGO  || defined __PSVITA__
 		C4JStorage::PROFILESETTINGS *pProfileSettings=StorageManager.GetDashboardProfileSettings(i);
 		// 4J-PB - don't cause an options write to happen here
@@ -2411,9 +2372,6 @@ void CMinecraftApp::CheckGameSettingsChanged(bool bOverride5MinuteTimer, int iPa
 				StorageManager.WriteToProfile(i,true, bOverride5MinuteTimer);
 #else
 				ProfileManager.WriteToProfile(i,true, bOverride5MinuteTimer);
-#ifdef _WINDOWS64
-				Win64_SaveSettings(GameSettingsA[i]);
-#endif
 #endif
 				GameSettingsA[i]->bSettingsChanged=false;
 			}
@@ -2427,9 +2385,6 @@ void CMinecraftApp::CheckGameSettingsChanged(bool bOverride5MinuteTimer, int iPa
 			StorageManager.WriteToProfile(iPad,true, bOverride5MinuteTimer);
 #else
 			ProfileManager.WriteToProfile(iPad,true, bOverride5MinuteTimer);
-#ifdef _WINDOWS64
-			Win64_SaveSettings(GameSettingsA[iPad]);
-#endif
 #endif
 			GameSettingsA[iPad]->bSettingsChanged=false;
 		}
diff --git a/Minecraft.Client/Extrax64Stubs.cpp b/Minecraft.Client/Extrax64Stubs.cpp
index 23b2c7f0..f368afed 100644
--- a/Minecraft.Client/Extrax64Stubs.cpp
+++ b/Minecraft.Client/Extrax64Stubs.cpp
@@ -199,11 +199,10 @@ DWORD IQNetPlayer::GetSendQueueSize(IQNetPlayer * player, DWORD dwFlags) { retur
 DWORD IQNetPlayer::GetCurrentRtt() { return 0; }
 bool IQNetPlayer::IsHost() { return m_isHostPlayer; }
 bool IQNetPlayer::IsGuest() { return false; }
-bool IQNetPlayer::IsLocal() { return true; }
-PlayerUID IQNetPlayer::GetXuid() { return INVALID_XUID; }
-extern wstring g_playerName;
-LPCWSTR IQNetPlayer::GetGamertag() { return g_playerName.empty() ? L"Windows" : g_playerName.c_str(); }
-int IQNetPlayer::GetSessionIndex() { return 0; }
+bool IQNetPlayer::IsLocal() { return !m_isRemote; }
+PlayerUID IQNetPlayer::GetXuid() { return (PlayerUID)(0xe000d45248242f2e + m_smallId); }
+LPCWSTR IQNetPlayer::GetGamertag() { return m_gamertag; }
+int IQNetPlayer::GetSessionIndex() { return m_smallId; }
 bool IQNetPlayer::IsTalking() { return false; }
 bool IQNetPlayer::IsMutedByLocalUser(DWORD dwUserIndex) { return false; }
 bool IQNetPlayer::HasVoice() { return false; }
diff --git a/Minecraft.Client/Windows64/Windows64_App.cpp b/Minecraft.Client/Windows64/Windows64_App.cpp
index 461e8c34..dbc1bfc5 100644
--- a/Minecraft.Client/Windows64/Windows64_App.cpp
+++ b/Minecraft.Client/Windows64/Windows64_App.cpp
@@ -10,46 +10,11 @@
 #include "..\..\Minecraft.World\BiomeSource.h"
 #include "..\..\Minecraft.World\LevelType.h"
 
-wstring g_playerName;
-
 CConsoleMinecraftApp app;
 
-static void LoadPlayerName()
-{
-	if (!g_playerName.empty()) return;
-	g_playerName = L"Windows";
-
-	char exePath[MAX_PATH] = {};
-	GetModuleFileNameA(NULL, exePath, MAX_PATH);
-	char *lastSlash = strrchr(exePath, '\\');
-	if (lastSlash) *(lastSlash + 1) = '\0';
-	char filePath[MAX_PATH] = {};
-	_snprintf_s(filePath, sizeof(filePath), _TRUNCATE, "%susername.txt", exePath);
-
-	FILE *f = NULL;
-	if (fopen_s(&f, filePath, "r") == 0 && f)
-	{
-		char buf[128] = {};
-		if (fgets(buf, sizeof(buf), f))
-		{
-			int len = (int)strlen(buf);
-			while (len > 0 && (buf[len-1] == '\n' || buf[len-1] == '\r' || buf[len-1] == ' '))
-				buf[--len] = '\0';
-			if (len > 0)
-			{
-				wchar_t wbuf[128] = {};
-				mbstowcs(wbuf, buf, 127);
-				g_playerName = wbuf;
-			}
-		}
-		fclose(f);
-	}
-}
-
 CConsoleMinecraftApp::CConsoleMinecraftApp() : CMinecraftApp()
 {
 	m_bShutdown = false;
-	LoadPlayerName();
 }
 
 void CConsoleMinecraftApp::SetRichPresenceContext(int iPad, int contextId)
@@ -70,27 +35,9 @@ void CConsoleMinecraftApp::FatalLoadError()
 
 void CConsoleMinecraftApp::CaptureSaveThumbnail()
 {
-	RenderManager.CaptureThumbnail(&m_ThumbnailBuffer);
 }
 void CConsoleMinecraftApp::GetSaveThumbnail(PBYTE *pbData,DWORD *pdwSize)
 {
-	// On a save caused by a create world, the thumbnail capture won't have happened
-	if (m_ThumbnailBuffer.Allocated())
-	{
-		if (pbData)
-		{
-			*pbData  = new BYTE[m_ThumbnailBuffer.GetBufferSize()];
-			*pdwSize = m_ThumbnailBuffer.GetBufferSize();
-			memcpy(*pbData, m_ThumbnailBuffer.GetBufferPointer(), *pdwSize);
-		}
-		m_ThumbnailBuffer.Release();
-	}
-	else
-	{
-		// No capture happened (e.g. first save on world creation) leave thumbnail as NULL
-		if (pbData)  *pbData  = NULL;
-		if (pdwSize) *pdwSize = 0;
-	}
 }
 void CConsoleMinecraftApp::ReleaseSaveThumbnail()
 {
@@ -110,8 +57,8 @@ void CConsoleMinecraftApp::TemporaryCreateGameStart()
 	Minecraft *pMinecraft=Minecraft::GetInstance();
 	app.ReleaseSaveThumbnail();
 	ProfileManager.SetLockedProfile(0);
-	LoadPlayerName();
-	pMinecraft->user->name = g_playerName;
+	extern wchar_t g_Win64UsernameW[17];
+	pMinecraft->user->name = g_Win64UsernameW;
 	app.ApplyGameSettingsChanged(0);
 
 	////////////////////////////////////////////////////////////////////////////////////////////// From CScene_MultiGameJoinLoad::OnInit
diff --git a/Minecraft.Client/Windows64/Windows64_App.h b/Minecraft.Client/Windows64/Windows64_App.h
index bff916ec..de8f6d85 100644
--- a/Minecraft.Client/Windows64/Windows64_App.h
+++ b/Minecraft.Client/Windows64/Windows64_App.h
@@ -1,9 +1,7 @@
 #pragma once
-#include "4JLibs\inc\4J_Render.h"
 
 class CConsoleMinecraftApp : public CMinecraftApp
 {
-	ImageFileBuffer m_ThumbnailBuffer;
 public:
 	CConsoleMinecraftApp();
 
diff --git a/Minecraft.Client/Windows64/Windows64_Minecraft.cpp b/Minecraft.Client/Windows64/Windows64_Minecraft.cpp
index 48040c66..272b29bf 100644
--- a/Minecraft.Client/Windows64/Windows64_Minecraft.cpp
+++ b/Minecraft.Client/Windows64/Windows64_Minecraft.cpp
@@ -729,16 +729,7 @@ int APIENTRY _tWinMain(_In_ HINSTANCE hInstance,
 	UNREFERENCED_PARAMETER(hPrevInstance);
 	UNREFERENCED_PARAMETER(lpCmdLine);
 
-	// 4J-Win64: set CWD to exe dir so asset paths resolve correctly
-	{
-		char szExeDir[MAX_PATH] = {};
-		GetModuleFileNameA(NULL, szExeDir, MAX_PATH);
-		char *pSlash = strrchr(szExeDir, '\\');
-		if (pSlash) { *(pSlash + 1) = '\0'; SetCurrentDirectoryA(szExeDir); }
-	}
-
-	// Declare DPI awareness so GetSystemMetrics returns physical pixels
-	SetProcessDPIAware();
+	dyn_SetProcessDpiAwareness(PROCESS_PER_MONITOR_DPI_AWARE);
 	g_iScreenWidth = GetSystemMetrics(SM_CXSCREEN);
 	g_iScreenHeight = GetSystemMetrics(SM_CYSCREEN);
 
@@ -1272,21 +1263,7 @@ int APIENTRY _tWinMain(_In_ HINSTANCE hInstance,
 			}
 		}
 
-		// F3 toggles the debug console overlay, F11 toggles fullscreen
-		if (KMInput.IsKeyPressed(VK_F3))
-		{
-			static bool s_debugConsole = false;
-			s_debugConsole = !s_debugConsole;
-			ui.ShowUIDebugConsole(s_debugConsole);
-		}
-
-#ifdef _DEBUG_MENUS_ENABLED
-		if (KMInput.IsKeyPressed(VK_F4))
-		{
-			ui.NavigateToScene(ProfileManager.GetPrimaryPad(), eUIScene_DebugOverlay, NULL, eUILayer_Debug);
-		}
-#endif
-
+		// F11 toggles fullscreen
 		if (KMInput.IsKeyPressed(VK_F11))
 		{
 			ToggleFullscreen();