backups/LCEMP
2
0
Fork 0
mirror of https://github.com/LCEMP/LCEMP.git synced 2026-08-05 08:32:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'main' of https://github.com/LCEMP/LCEMP

Browse source
This commit is contained in:
NOTPIES 2026-03-15 22:21:33 -03:00
parent 9b34142250 4390435f06
commit 6369cb5bfd
2 changed files with 8 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Minecraft.Client/Common/XUI/XUI_InGamePlayerOptions.cpp
View file

@ -11,9 +11,7 @@
//----------------------------------------------------------------------------------
// Performs initialization tasks - retrieves controls. // Performs initialization tasks - retrieves controls.
//----------------------------------------------------------------------------------
HRESULT CScene_InGamePlayerOptions::OnInit( XUIMessageInit* pInitData, BOOL& bHandled ) HRESULT CScene_InGamePlayerOptions::OnInit( XUIMessageInit* pInitData, BOOL& bHandled )
{ {
m_iPad = *(int *)pInitData->pvInitData; m_iPad = *(int *)pInitData->pvInitData;
@ -496,4 +494,4 @@ void CScene_InGamePlayerOptions::resetCheatCheckboxes()
m_checkboxes[eControl_CheatTeleport].SetCheck( isModerator m_checkboxes[eControl_CheatTeleport].SetCheck( isModerator
&& (Player::getPlayerGamePrivilege(m_playerPrivileges, Player::ePlayerGamePrivilege_CanTeleport) != 0) ); && (Player::getPlayerGamePrivilege(m_playerPrivileges, Player::ePlayerGamePrivilege_CanTeleport) != 0) );
} }
} }

22
Minecraft.Client/Windows64/Windows64_Minecraft.cpp
View file

@ -76,11 +76,9 @@ DWORD dwProfileSettingsA[NUM_PROFILE_VALUES]=
#endif #endif
}; };
//------------------------------------------------------------------------------------- // Time Since fAppTime is a float, it doesn't need to keep the quadword app time
// Time Since fAppTime is a float, we need to keep the quadword app time // as a LARGE_INTEGER so that it doesn't lose precision after running
// as a LARGE_INTEGER so that we don't lose precision after running // for a while.
// for a long time.
//-------------------------------------------------------------------------------------
BOOL g_bWidescreen = TRUE; BOOL g_bWidescreen = TRUE;
@ -647,9 +645,7 @@ LRESULT CALLBACK DlgProc(HWND hWndDlg, UINT Msg, WPARAM wParam, LPARAM lParam)
return FALSE; return FALSE;
} }
//--------------------------------------------------------------------------------------
// Create Direct3D device and swap chain // Create Direct3D device and swap chain
//--------------------------------------------------------------------------------------
HRESULT InitDevice() HRESULT InitDevice()
{ {
HRESULT hr = S_OK; HRESULT hr = S_OK;
@ -762,9 +758,7 @@ app.DebugPrintf("width: %d, height: %d\n", width, height);
return S_OK; return S_OK;
} }
//-------------------------------------------------------------------------------------- // render the frame
// Render the frame
//--------------------------------------------------------------------------------------
void Render() void Render()
{ {
// Just clear the backbuffer // Just clear the backbuffer
@ -774,9 +768,7 @@ void Render()
g_pSwapChain->Present( 0, 0 ); g_pSwapChain->Present( 0, 0 );
} }
//-------------------------------------------------------------------------------------- // Clean up the objects it's created
// Clean up the objects we've created
//--------------------------------------------------------------------------------------
void CleanupDevice() void CleanupDevice()
{ {
extern void Windows64_RestoreGamma(); extern void Windows64_RestoreGamma();
@ -1047,7 +1039,7 @@ int APIENTRY _tWinMain(_In_ HINSTANCE hInstance,
} }
} }
// Set a callback for the default player options to be set - when there is no profile data for the player // Set a callback for the default player options to be set when there is no profile data for the player
ProfileManager.SetDefaultOptionsCallback(&CConsoleMinecraftApp::DefaultOptionsCallback,(LPVOID)&app); ProfileManager.SetDefaultOptionsCallback(&CConsoleMinecraftApp::DefaultOptionsCallback,(LPVOID)&app);
#if 0 #if 0
// Set a callback to deal with old profile versions needing updated to new versions // Set a callback to deal with old profile versions needing updated to new versions
@ -1687,4 +1679,4 @@ void MemPixStuff()
PIXAddNamedCounter(((float)allSectsTotal)/(4096.0f),"MemSect total pages"); PIXAddNamedCounter(((float)allSectsTotal)/(4096.0f),"MemSect total pages");
} }
#endif #endif