backups/MinecraftConsoles
2
0
Fork 1
mirror of https://github.com/smartcmd/MinecraftConsoles.git synced 2026-08-20 09:57:09 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge 7daa4134ec into ecb3f00bd6

Browse source
This commit is contained in:
Jazzitch 2026-03-20 06:18:41 +00:00 committed by GitHub
parent ecb3f00bd6 7daa4134ec
commit 83d846d3d7
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Minecraft.Client/DeathScreen.cpp
View file

@ -9,7 +9,7 @@ void DeathScreen::init()
{ {
buttons.clear(); buttons.clear();
buttons.push_back(new Button(1, width / 2 - 100, height / 4 + 24 * 3, L"Respawn")); buttons.push_back(new Button(1, width / 2 - 100, height / 4 + 24 * 3, L"Respawn"));
buttons.push_back(new Button(2, width / 2 - 100, height / 4 + 24 * 4, L"Title menu")); buttons.push_back(new Button(2, width / 2 - 100, height / 4 + 24 * 4, L"Exit to Title Menu"));
if (minecraft->user == nullptr) if (minecraft->user == nullptr)
{ {
@ -46,7 +46,7 @@ void DeathScreen::render(int xm, int ym, float a)
glPushMatrix(); glPushMatrix();
glScalef(2, 2, 2); glScalef(2, 2, 2);
drawCenteredString(font, L"Game over!", width / 2 / 2, 60 / 2, 0xffffff); drawCenteredString(font, L"Game Over!", width / 2 / 2, 60 / 2, 0xffffff);
glPopMatrix(); glPopMatrix();
drawCenteredString(font, L"Score: &e" + std::to_wstring( minecraft->player->getScore() ), width / 2, 100, 0xffffff); drawCenteredString(font, L"Score: &e" + std::to_wstring( minecraft->player->getScore() ), width / 2, 100, 0xffffff);
@ -64,4 +64,4 @@ void DeathScreen::render(int xm, int ym, float a)
bool DeathScreen::isPauseScreen() bool DeathScreen::isPauseScreen()
{ {
return false; return false;
} }

4
Minecraft.Client/NameEntryScreen.cpp
View file

@ -53,7 +53,7 @@ void NameEntryScreen::buttonClicked(Button button)
void NameEntryScreen::keyPressed(wchar_t ch, int eventKey) void NameEntryScreen::keyPressed(wchar_t ch, int eventKey)
{ {
if (eventKey == Keyboard::KEY_BACK && name.length() > 0) name = name.substr(0, name.length() - 1); if (eventKey == Keyboard::KEY_BACK && name.length() > 0) name = name.substr(0, name.length() - 1);
if (allowedChars.find(ch) != wstring::npos && name.length()<64) if (allowedChars.find(ch) != wstring::npos && name.length()<100)
{ {
name += ch; name += ch;
} }
@ -75,4 +75,4 @@ void NameEntryScreen::render(int xm, int ym, float a)
drawString(font, name + (frame / 6 % 2 == 0 ? L"_" : L""), bx + 4, by + (bh - 8) / 2, 0xe0e0e0); drawString(font, name + (frame / 6 % 2 == 0 ? L"_" : L""), bx + 4, by + (bh - 8) / 2, 0xe0e0e0);
Screen::render(xm, ym, a); Screen::render(xm, ym, a);
} }

12
Minecraft.Client/PauseScreen.cpp
View file

@ -21,14 +21,14 @@ void PauseScreen::init()
saveStep = 0; saveStep = 0;
buttons.clear(); buttons.clear();
int yo = -16; int yo = -16;
buttons.push_back(new Button(1, width / 2 - 100, height / 4 + 24 * 5 + yo, L"Save and quit to title")); buttons.push_back(new Button(1, width / 2 - 100, height / 4 + 24 * 5 + yo, L"Save and Quit"));
if (minecraft->isClientSide()) if (minecraft->isClientSide())
{ {
buttons[0]->msg = L"Disconnect"; buttons[0]->msg = L"Disconnect from Server";
} }
buttons.push_back(new Button(4, width / 2 - 100, height / 4 + 24 * 1 + yo, L"LBack to game")); buttons.push_back(new Button(4, width / 2 - 100, height / 4 + 24 * 1 + yo, L"LBack to Game"));
buttons.push_back(new Button(0, width / 2 - 100, height / 4 + 24 * 4 + yo, L"LOptions...")); buttons.push_back(new Button(0, width / 2 - 100, height / 4 + 24 * 4 + yo, L"LOptions..."));
buttons.push_back(new Button(5, width / 2 - 100, height / 4 + 24 * 2 + yo, 98, 20, I18n::get(L"gui.achievements"))); buttons.push_back(new Button(5, width / 2 - 100, height / 4 + 24 * 2 + yo, 98, 20, I18n::get(L"gui.achievements")));
@ -90,10 +90,10 @@ void PauseScreen::render(int xm, int ym, float a)
col = Mth::sin(col * PI * 2) * 0.2f + 0.8f; col = Mth::sin(col * PI * 2) * 0.2f + 0.8f;
int br = static_cast<int>(255 * col); int br = static_cast<int>(255 * col);
drawString(font, L"Saving level..", 8, height - 16, br << 16 | br << 8 | br); drawString(font, L"Saving World..", 8, height - 16, br << 16 | br << 8 | br);
} }
drawCenteredString(font, L"Game menu", width / 2, 40, 0xffffff); drawCenteredString(font, L"Game Menu", width / 2, 40, 0xffffff);
Screen::render(xm, ym, a); Screen::render(xm, ym, a);
} }

4
Minecraft.World/Level.h
View file

@ -63,8 +63,8 @@ public:
public: public:
static const int MAX_XBOX_BOATS = 40; // Max number of boats static const int MAX_XBOX_BOATS = 50; // Max number of boats
static const int MAX_CONSOLE_MINECARTS = 40; static const int MAX_CONSOLE_MINECARTS = 50;
static const int MAX_DISPENSABLE_FIREBALLS = 200; static const int MAX_DISPENSABLE_FIREBALLS = 200;
static const int MAX_DISPENSABLE_PROJECTILES = 300; static const int MAX_DISPENSABLE_PROJECTILES = 300;