mirror of
https://github.com/smartcmd/MinecraftConsoles.git
synced 2026-05-11 19:53:52 +00:00
Revert "Project modernization (#630)"
This code was not tested and breaks in Release builds, reverting to restore
functionality of the nightly. All in-game menus do not work and generating
a world crashes.
This reverts commit a9be52c41a.
This commit is contained in:
parent
a9be52c41a
commit
087b7e7abf
1373 changed files with 19449 additions and 19903 deletions
|
|
@ -52,7 +52,7 @@ void AchievementScreen::buttonClicked(Button *button)
|
|||
{
|
||||
if (button->id == 1)
|
||||
{
|
||||
minecraft->setScreen(nullptr);
|
||||
minecraft->setScreen(NULL);
|
||||
// minecraft->grabMouse(); // 4J removed
|
||||
}
|
||||
Screen::buttonClicked(button);
|
||||
|
|
@ -62,7 +62,7 @@ void AchievementScreen::keyPressed(char eventCharacter, int eventKey)
|
|||
{
|
||||
if (eventKey == minecraft->options->keyBuild->key)
|
||||
{
|
||||
minecraft->setScreen(nullptr);
|
||||
minecraft->setScreen(NULL);
|
||||
// minecraft->grabMouse(); // 4J removed
|
||||
}
|
||||
else
|
||||
|
|
@ -286,7 +286,7 @@ void AchievementScreen::renderBg(int xm, int ym, float a)
|
|||
vLine(x2, y1, y2, color);
|
||||
}
|
||||
|
||||
Achievement *hoveredAchievement = nullptr;
|
||||
Achievement *hoveredAchievement = NULL;
|
||||
ItemRenderer *ir = new ItemRenderer();
|
||||
|
||||
glPushMatrix();
|
||||
|
|
@ -372,7 +372,7 @@ void AchievementScreen::renderBg(int xm, int ym, float a)
|
|||
glEnable(GL_TEXTURE_2D);
|
||||
Screen::render(xm, ym, a);
|
||||
|
||||
if (hoveredAchievement != nullptr)
|
||||
if (hoveredAchievement != NULL)
|
||||
{
|
||||
Achievement *ach = hoveredAchievement;
|
||||
wstring name = ach->name;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue