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

* Fix screwed up formatting.

Browse Source
This commit is contained in:
iProgramInCpp
2024-01-22 18:39:44 +02:00
parent 501a2a8dbd
commit 047fd3120f
6 changed files with 66 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
source/client/gui/Gui.cpp
View File

@@ -108,9 +108,9 @@ void Gui::renderVignette(float a2, int a3, int a4)
Tesselator& t = Tesselator::instance;
t.begin();
t.vertexUV(0.0f, a4, -90.0f, 0.0f, 1.0f);
t.vertexUV(a3, a4, -90.0f, 1.0f, 1.0f);
t.vertexUV(a3, 0.0f, -90.0f, 1.0f, 0.0f);
t.vertexUV(0.0f, a4, -90.0f, 0.0f, 1.0f);
t.vertexUV(a3, a4, -90.0f, 1.0f, 1.0f);
t.vertexUV(a3, 0.0f, -90.0f, 1.0f, 0.0f);
t.vertexUV(0.0f, 0.0f, -90.0f, 0.0f, 0.0f);
t.draw();
@@ -150,8 +150,8 @@ void Gui::render(float f, bool bHaveScreen, int mouseX, int mouseY)
field_4 = -90.0f;
int width = Minecraft::width * InvGuiScale,
height = Minecraft::height * InvGuiScale;
int width = int(ceilf(Minecraft::width * InvGuiScale)),
height = int(ceilf(Minecraft::height * InvGuiScale));
#ifdef ENH_TRANSPARENT_HOTBAR
glEnable(GL_BLEND);
@@ -298,8 +298,8 @@ void Gui::render(float f, bool bHaveScreen, int mouseX, int mouseY)
if (m->m_pLocalPlayer->isUnderLiquid(Material::water))
{
int breathRaw = m->m_pLocalPlayer->field_BC;
int breathFull = int(ceilf((float(breathRaw - 2) * 10.0f) / 300.0f));
int breathMeter = int(ceilf((float(breathRaw) * 10.0f) / 300.0f)) - breathFull;
int breathFull = int(ceilf((float(breathRaw - 2) * 10.0f) / 300.0f));
int breathMeter = int(ceilf((float(breathRaw) * 10.0f) / 300.0f)) - breathFull;
int bubbleX = cenX - 191;
int bubbleY = height - 19;
@@ -490,7 +490,7 @@ void Gui::handleKeyPressed(int keyCode)
void Gui::renderMessages(bool bShowAll)
{
//int width = Minecraft::width * InvGuiScale,
int height = Minecraft::height * InvGuiScale;
int height = int(ceilf(Minecraft::height * InvGuiScale));
int topEdge = height - 49;

16
source/client/gui/screens/IngameBlockSelectionScreen.cpp
View File

@@ -14,7 +14,7 @@
std::string g_sNotAvailableInDemoVersion = "Not available in the demo version";
IngameBlockSelectionScreen::IngameBlockSelectionScreen() :
m_btnPause(0, "Pause")
m_btnPause(0, "Pause")
{
m_selectedSlot = 0;
}
@@ -75,10 +75,10 @@ void IngameBlockSelectionScreen::init()
m_btnPause.m_xPos = 0;
m_btnPause.m_yPos = 0;
#if TARGET_OS_IPHONE != 0
if (m_pMinecraft->isTouchscreen())
m_buttons.push_back(&m_btnPause);
if (m_pMinecraft->isTouchscreen())
m_buttons.push_back(&m_btnPause);
#endif
Inventory* pInv = getInventory();
int nItems = pInv->getNumItems();
@@ -166,8 +166,8 @@ void IngameBlockSelectionScreen::buttonClicked(Button* pButton)
void IngameBlockSelectionScreen::mouseClicked(int x, int y, int type)
{
Screen::mouseClicked(x, y, type);
Screen::mouseClicked(x, y, type);
// not a left click
if (type != 1)
return;
@@ -179,8 +179,8 @@ void IngameBlockSelectionScreen::mouseClicked(int x, int y, int type)
void IngameBlockSelectionScreen::mouseReleased(int x, int y, int type)
{
Screen::mouseReleased(x, y, type);
Screen::mouseReleased(x, y, type);
// not a left click
if (type != 1)
return;