forked from cafeberry/cafeberry
fix: windows64 only falling back to 720 & update 4JLibs
This commit is contained in:
@@ -6257,6 +6257,7 @@ void CMinecraftApp::InitialiseTips()
|
||||
ZeroMemory(m_TipIDA,sizeof(UINT)*MAX_TIPS_GAMETIP+MAX_TIPS_TRIVIATIP);
|
||||
|
||||
// Make the first tip tell you that you can play splitscreen in HD modes if you are in SD
|
||||
//str1k3r - this doesnt work on Windows64, can someone help me with this? please.
|
||||
if(!RenderManager.IsHiDef())
|
||||
{
|
||||
m_GameTipA[0].uiStringID=IDS_TIPS_GAMETIP_0;
|
||||
|
||||
@@ -2036,11 +2036,7 @@ void CGameNetworkManager::ServerStoppedWait()
|
||||
RenderManager.Tick();
|
||||
ui.tick();
|
||||
ui.render();
|
||||
#ifdef _WINDOWS64
|
||||
RenderManager.Present(g_iScreenWidth, g_iScreenWidth);
|
||||
#else
|
||||
RenderManager.Present();
|
||||
#endif
|
||||
} while( result == WAIT_TIMEOUT );
|
||||
}
|
||||
else
|
||||
|
||||
@@ -320,11 +320,36 @@ void UIScene::loadMovie()
|
||||
|
||||
if(!app.hasArchiveFile(moviePath))
|
||||
{
|
||||
//str1k3r - if were on Windows64 we have more fallbacks dont just report a FatalLoadError, try those other swfs before reporting a FatalLoadError
|
||||
#ifndef _WINDOWS64
|
||||
app.DebugPrintf("ERROR: Could not find any iggy movie for %ls!\n", moviePath.c_str());
|
||||
|
||||
#ifndef _CONTENT_PACKAGE
|
||||
__debugbreak();
|
||||
#endif
|
||||
app.FatalLoadError();
|
||||
#else
|
||||
app.DebugPrintf("WARNING: Could not find iggy movie %ls, falling back on 480\n", moviePath.c_str());
|
||||
|
||||
moviePath = getMoviePath();
|
||||
moviePath.append(L"480.swf");
|
||||
m_loadedResolution = eSceneResolution_480;
|
||||
|
||||
//str1k3r - while 480 & Vita share basically all the same skins its just a extra fallback :D
|
||||
if(!app.hasArchiveFile(moviePath))
|
||||
{
|
||||
app.DebugPrintf("WARNING: Could not find iggy movie %ls, falling back on Vita\n", moviePath.c_str());
|
||||
|
||||
moviePath = getMoviePath();
|
||||
moviePath.append(L"Vita.swf");
|
||||
m_loadedResolution = eSceneResolution_Vita;
|
||||
|
||||
if(!app.hasArchiveFile(moviePath))
|
||||
{
|
||||
app.FatalLoadError();
|
||||
}
|
||||
}
|
||||
#endif
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Submodule Minecraft.Client/Windows64/4JLibs updated: 2c2c7b8075...4c50659091
@@ -323,7 +323,7 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
|
||||
// Tick UI
|
||||
ui.tick();
|
||||
ui.render();
|
||||
RenderManager.Present(g_iScreenWidth, g_iScreenWidth);
|
||||
RenderManager.Present();
|
||||
ui.CheckMenuDisplayed();
|
||||
|
||||
// Tick Managers
|
||||
@@ -753,6 +753,9 @@ int APIENTRY _tWinMain(_In_ HINSTANCE hInstance,
|
||||
}
|
||||
|
||||
RenderManager.Initialise(g_pd3dDevice, g_pSwapChain);
|
||||
|
||||
//str1k3r - set the resolution that we have at time of launch
|
||||
RenderManager.setResolution(g_iScreenWidth, g_iScreenHeight);
|
||||
|
||||
app.loadStringTable();
|
||||
ui.init(g_pd3dDevice,g_pImmediateContext,g_pRenderTargetView,g_pDepthStencilView,g_iScreenWidth,g_iScreenHeight);
|
||||
@@ -878,8 +881,11 @@ int APIENTRY _tWinMain(_In_ HINSTANCE hInstance,
|
||||
ui.tick();
|
||||
ui.render();
|
||||
|
||||
//str1k3r - now set the resolution a FUCK ton of times to tell 4J to fuck off with their hardcoded shit
|
||||
RenderManager.setResolution(g_iScreenWidth, g_iScreenHeight);
|
||||
|
||||
// Present the frame.
|
||||
RenderManager.Present(g_iScreenWidth, g_iScreenWidth);
|
||||
RenderManager.Present();
|
||||
|
||||
ui.CheckMenuDisplayed();
|
||||
|
||||
|
||||
Reference in New Issue
Block a user