Skip to content

Increase max limits for boats and minecarts slightly, but not any wor… #1349

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Jazzitch wants to merge 4 commits into from
+13 −13
Closed

Increase max limits for boats and minecarts slightly, but not any wor… #1349

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
79e8a2f
Increase max limits for boats and minecarts slightly, but not any wor…
Jazzitch Mar 19, 2026
8dbbee6
Update PauseScreen text for clarity and capitalisation
Jazzitch Mar 20, 2026
8db8236
Update DeathScreen message text for clarity and capitalisation.
Jazzitch Mar 20, 2026
7daa413
Increase maximum name length from 64 to 100 characters so players can…
Jazzitch Mar 20, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions Minecraft.Client/DeathScreen.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ void DeathScreen::init()
{
buttons.clear();
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)
{
Expand Down Expand Up @@ -46,7 +46,7 @@ void DeathScreen::render(int xm, int ym, float a)

glPushMatrix();
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();
drawCenteredString(font, L"Score: &e" + std::to_wstring( minecraft->player->getScore() ), width / 2, 100, 0xffffff);

Expand All @@ -64,4 +64,4 @@ void DeathScreen::render(int xm, int ym, float a)
bool DeathScreen::isPauseScreen()
{
return false;
}
}
4 changes: 2 additions & 2 deletions Minecraft.Client/NameEntryScreen.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ void NameEntryScreen::buttonClicked(Button button)
void NameEntryScreen::keyPressed(wchar_t ch, int eventKey)
{
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;
}
Expand All @@ -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);

Screen::render(xm, ym, a);
}
}
12 changes: 6 additions & 6 deletions Minecraft.Client/PauseScreen.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,14 @@ void PauseScreen::init()
saveStep = 0;
buttons.clear();
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())
{
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(5, width / 2 - 100, height / 4 + 24 * 2 + yo, 98, 20, I18n::get(L"gui.achievements")));
Expand Down Expand Up @@ -90,10 +90,10 @@ void PauseScreen::render(int xm, int ym, float a)
col = Mth::sin(col * PI * 2) * 0.2f + 0.8f;
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);
}
}
4 changes: 2 additions & 2 deletions Minecraft.World/Level.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,8 @@ class Level : public LevelSource


public:
static const int MAX_XBOX_BOATS = 40; // Max number of boats
static const int MAX_CONSOLE_MINECARTS = 40;
static const int MAX_XBOX_BOATS = 50; // Max number of boats
static const int MAX_CONSOLE_MINECARTS = 50;
static const int MAX_DISPENSABLE_FIREBALLS = 200;
static const int MAX_DISPENSABLE_PROJECTILES = 300;

Expand Down
Loading