celisej567/mcpe
1
0
Fork 0
mirror of https://github.com/celisej567/mcpe.git synced 2026-09-11 20:11:18 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

* Rename screen related fields in Minecraft class

Browse Source
This commit is contained in:
iProgramInCpp
2023-08-05 16:26:02 +03:00
parent 0ceef907c0
commit 9d88bfb962
6 changed files with 55 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
source/client/common/Utils.cpp
View File

@@ -254,11 +254,10 @@ void EnableOpenGL(HWND hwnd, HDC* hDC, HGLRC* hRC)
pfd.nSize = sizeof(pfd);
pfd.nVersion = 1;
pfd.dwFlags = PFD_DRAW_TO_WINDOW |
PFD_SUPPORT_OPENGL | PFD_DOUBLEBUFFER;
pfd.dwFlags = PFD_DRAW_TO_WINDOW | PFD_SUPPORT_OPENGL | PFD_DOUBLEBUFFER;
pfd.iPixelType = PFD_TYPE_RGBA;
pfd.cColorBits = 24;
pfd.cDepthBits = 16;
pfd.cDepthBits = 8;
pfd.iLayerType = PFD_MAIN_PLANE;
iFormat = ChoosePixelFormat(*hDC, &pfd);

4
source/client/gui/screens/SavingWorldScreen.cpp
View File

@@ -55,14 +55,14 @@ void SavingWorldScreen::tick()
m_pMinecraft->m_pLevel = nullptr;
}
m_pMinecraft->field_DB0 = true;
m_pMinecraft->m_bUsingScreen = true;
if (m_bCopyMapAtEnd)
m_pMinecraft->setScreen(new RenameMPLevelScreen("_LastJoinedServer"));
else
m_pMinecraft->setScreen(new StartMenuScreen);
m_pMinecraft->field_DB0 = false;
m_pMinecraft->m_bUsingScreen = false;
m_pMinecraft->field_288 = false;
}

10
source/client/renderer/GameRenderer.cpp
View File

@@ -549,11 +549,11 @@ void GameRenderer::render(float f)
renderLevel(f);
if (m_pMinecraft->m_options.field_23C)
{
if (!m_pMinecraft->field_D14)
if (!m_pMinecraft->m_pScreen)
return;
}
m_pMinecraft->m_gui.render(f, m_pMinecraft->field_D14 != nullptr, int(Mouse::_x * Gui::InvGuiScale), int(Mouse::_y * Gui::InvGuiScale));
m_pMinecraft->m_gui.render(f, m_pMinecraft->m_pScreen != nullptr, int(Mouse::_x * Gui::InvGuiScale), int(Mouse::_y * Gui::InvGuiScale));
}
}
else
@@ -566,12 +566,12 @@ void GameRenderer::render(float f)
setupGuiScreen();
}
if (m_pMinecraft->field_D14)
if (m_pMinecraft->m_pScreen)
{
glClear(GL_ACCUM);
m_pMinecraft->field_D14->render(int(Mouse::_x * Gui::InvGuiScale), int(Mouse::_y * Gui::InvGuiScale), f);
m_pMinecraft->m_pScreen->render(int(Mouse::_x * Gui::InvGuiScale), int(Mouse::_y * Gui::InvGuiScale), f);
if (m_pMinecraft->field_D14 && !m_pMinecraft->field_D14->isInGameScreen())
if (m_pMinecraft->m_pScreen && !m_pMinecraft->m_pScreen->isInGameScreen())
{
#ifdef ORIGINAL_CODE
sleepMs(15);