alex/MinecraftConsoles
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main' into dec-2014

Browse Source 
# Conflicts:
#	Minecraft.Client/LocalPlayer.cpp
This commit is contained in:
Loki Rautio
2026-03-01 12:05:30 -06:00
parent 425ea4df34 33e1b5ceb9
commit e4ed56eae8
7 changed files with 57 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Minecraft.Client/Windows64/Windows64_App.cpp
View File

@@ -26,6 +26,8 @@ void CConsoleMinecraftApp::StoreLaunchData()
}
void CConsoleMinecraftApp::ExitGame()
{
// This is likely not the correct way to exit the game, but it will do for now
ExitProcess(0);
}
void CConsoleMinecraftApp::FatalLoadError()
{

20
Minecraft.Client/Windows64/Windows64_Minecraft.cpp
View File

@@ -716,6 +716,26 @@ int APIENTRY _tWinMain(_In_ HINSTANCE hInstance,
UNREFERENCED_PARAMETER(hPrevInstance);
UNREFERENCED_PARAMETER(lpCmdLine);
WCHAR exePath[MAX_PATH] = { 0 };
GetModuleFileNameW(NULL, exePath, MAX_PATH);
WCHAR* lastSlash = wcsrchr(exePath, L'\\');
if (lastSlash) {
*lastSlash = L'\0';
WCHAR devCheckPath[MAX_PATH] = { 0 };
swprintf_s(devCheckPath, MAX_PATH, L"%s\\..\\..\\Minecraft.Client\\Minecraft.Client.vcxproj", exePath);
if (GetFileAttributesW(devCheckPath) != INVALID_FILE_ATTRIBUTES) {
WCHAR projectPath[MAX_PATH] = { 0 };
swprintf_s(projectPath, MAX_PATH, L"%s\\..\\..\\Minecraft.Client", exePath);
SetCurrentDirectoryW(projectPath);
}
else {
SetCurrentDirectoryW(exePath);
}
}
// Declare DPI awareness so GetSystemMetrics returns physical pixels
SetProcessDPIAware();
g_iScreenWidth = GetSystemMetrics(SM_CXSCREEN);