github/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2025-07-31 03:50:37 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Clean controller menu (#4223)

Browse source 
* Improved Ocarina Controls

* Move speed modifiers to modifier section

* Move DpadEquips, PauseAnyCursor & NaviOnL

* Add DpadHoldChange to menu

* Change DpadHoldChange checkbox to match default

* Change cvars from CVAR_SETTING to CVAR_ENHANCEMENT

* Update z_parameter.c
This commit is contained in:
Pepe20129 2024-10-14 02:28:39 +02:00 • committed by GitHub
parent e62f26d3bf
commit 1ffa23b5a9
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
18 changed files with 187 additions and 243 deletions
Download patch file Download diff file Expand all files Collapse all files

5
soh/src/code/z_parameter.c
View file

@ -3692,7 +3692,8 @@ void Interface_UpdateMagicBar(PlayState* play) {
(msgCtx->msgMode == MSGMODE_NONE) && (play->gameOverCtx.state == GAMEOVER_INACTIVE) &&
(play->transitionTrigger == TRANS_TRIGGER_OFF) && (play->transitionMode == TRANS_MODE_OFF) && !Play_InCsMode(play)) {
bool hasLens = false;
for (int buttonIndex = 1; buttonIndex < (CVarGetInteger(CVAR_SETTING("DpadEquips"), 0) != 0) ? ARRAY_COUNT(gSaveContext.equips.buttonItems) : 4; buttonIndex++) {
for (int buttonIndex = 1; buttonIndex < (CVarGetInteger(CVAR_ENHANCEMENT("DpadEquips"), 0) != 0) ? ARRAY_COUNT(gSaveContext.equips.buttonItems) : 4;
buttonIndex++) {
if (gSaveContext.equips.buttonItems[buttonIndex] == ITEM_LENS) {
hasLens = true;
break;
@ -5727,7 +5728,7 @@ void Interface_Draw(PlayState* play) {
Interface_DrawAmmoCount(play, 3, interfaceCtx->cRightAlpha);
}
if (CVarGetInteger(CVAR_SETTING("DpadEquips"), 0) != 0) {
if (CVarGetInteger(CVAR_ENHANCEMENT("DpadEquips"), 0) != 0) {
// DPad is only greyed-out when all 4 DPad directions are too
uint16_t dpadAlpha =
MAX(MAX(MAX(interfaceCtx->dpadUpAlpha, interfaceCtx->dpadDownAlpha), interfaceCtx->dpadLeftAlpha),