lolcat/minecraft-pe-0.6.1
1
0
Fork 0
mirror of https://gitea.sffempire.ru/Kolyah35/minecraft-pe-0.6.1.git synced 2026-03-19 22:43:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'refs/remotes/origin/main'

Browse Source
This commit is contained in:
Kolyah35
2026-03-19 02:27:04 +03:00
parent e9914e3fbd 157ef5ff05
commit e49f58bc89
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/client/gui/screens/OptionsScreen.cpp
View File

@@ -9,6 +9,7 @@
#include "../components/ImageButton.h" #include "../components/ImageButton.h"
#include "../components/OptionsGroup.h" #include "../components/OptionsGroup.h"
#include "platform/input/Keyboard.h"
OptionsScreen::OptionsScreen() OptionsScreen::OptionsScreen()
: btnClose(NULL), : btnClose(NULL),
@@ -153,18 +154,13 @@ void OptionsScreen::buttonClicked(Button* button) {
if (button == btnClose) { if (button == btnClose) {
minecraft->options.save(); minecraft->options.save();
minecraft->screenChooser.setScreen(SCREEN_STARTMENU); minecraft->screenChooser.setScreen(SCREEN_STARTMENU);
} }
else if (button->id > 1 && button->id < 7) { else if (button->id > 1 && button->id < 7) {
int categoryButton = button->id - categoryButtons[0]->id; int categoryButton = button->id - categoryButtons[0]->id;
selectCategory(categoryButton); selectCategory(categoryButton);
} }
else if (button == btnCredits) { else if (button == btnCredits) {
minecraft->setScreen(new CreditsScreen()); minecraft->setScreen(new CreditsScreen());
} }
} }
@@ -254,7 +250,9 @@ void OptionsScreen::mouseReleased(int x, int y, int buttonNum) {
void OptionsScreen::keyPressed(int eventKey) { void OptionsScreen::keyPressed(int eventKey) {
if (currentOptionsGroup != NULL) if (currentOptionsGroup != NULL)
currentOptionsGroup->keyPressed(minecraft, eventKey); currentOptionsGroup->keyPressed(minecraft, eventKey);
if (eventKey == Keyboard::KEY_ESCAPE)
minecraft->options.save();
super::keyPressed(eventKey); super::keyPressed(eventKey);
} }