mirror/Aquaria
1
0
Fork 0
mirror of https://github.com/AquariaOSE/Aquaria.git synced 2025-02-24 15:04:00 +00:00
Code Issues Releases Wiki Activity

Make key config a bit more user friendly

Browse source
This commit is contained in:
fgenesis 2021-01-12 17:30:23 +01:00
parent 19daa27528
commit 9c180ca5b7
4 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
Aquaria/InGameMenu.cpp
View file

@ -2002,6 +2002,14 @@ void InGameMenu::create()
const float offx = 140 - keyConfigBg->position.x; const float offx = 140 - keyConfigBg->position.x;
const float yi = 20; const float yi = 20;
keyConfigInstructions = new TTFText(&dsq->fontArialSmallest);
keyConfigInstructions->position = Vector(0, offy + 415);
keyConfigInstructions->setText(SB(2159));
keyConfigInstructions->color = Vector(0.6f, 0.7f, 0.8f);
keyConfigInstructions->alphaMod = 0;
keyConfigInstructions->setAlign(ALIGN_CENTER);
keyConfigBg->addChild(keyConfigInstructions, PM_POINTER);
TTFText *joystickLabel = new TTFText(&dsq->fontArialSmall); TTFText *joystickLabel = new TTFText(&dsq->fontArialSmall);
joystickLabel->position = Vector(offx, offy + 390); joystickLabel->position = Vector(offx, offy + 390);
joystickLabel->setText(SB(2140)); joystickLabel->setText(SB(2140));
@ -4000,6 +4008,8 @@ void InGameMenu::updateKeyConfigMenu(float dt)
= actionSetCheck->getValue(); = actionSetCheck->getValue();
} }
keyConfigInstructions->alphaMod = AquariaKeyConfig::waitingForInput ? 1.0f : 0.0f;
updateJoystickText(); updateJoystickText();
} }

1
Aquaria/InGameMenu.h
View file

@ -222,6 +222,7 @@ private:
AquariaCheckBox *actionSetCheck; AquariaCheckBox *actionSetCheck;
int selectedActionSetIdx; int selectedActionSetIdx;
TTFText *joystickNameText, *joystickGUIDText, *joystickButtonsText; TTFText *joystickNameText, *joystickGUIDText, *joystickButtonsText;
TTFText *keyConfigInstructions;
void updateActionSetComboBox(); void updateActionSetComboBox();
void switchToActionSet(int idx); void switchToActionSet(int idx);
void nextJoystick(); void nextJoystick();

2
Aquaria/StringBank_gen.h
View file

@ -262,4 +262,4 @@ BANKSTRING(2155, "Invalid joy button value: ")
BANKSTRING(2156, "Invalid mouse button id: ") BANKSTRING(2156, "Invalid mouse button id: ")
BANKSTRING(2157, "Invalid joy axis(+): ") BANKSTRING(2157, "Invalid joy axis(+): ")
BANKSTRING(2158, "Invalid joy axis(-): ") BANKSTRING(2158, "Invalid joy axis(-): ")
BANKSTRING(2159, "Press key to assign, Esc to abort, same key or Backspace/Del to clear")

3
files/data/stringbank.txt
View file

@ -260,4 +260,5 @@
2155 Invalid joy button value: 2155 Invalid joy button value:
2156 Invalid mouse button id: 2156 Invalid mouse button id:
2157 Invalid joy axis(+): 2157 Invalid joy axis(+):
2158 Invalid joy axis(-): 2158 Invalid joy axis(-):
2159 Press key to assign, Esc to abort, same key or Backspace/Del to clear