mirror
/
Shipwright
mirror of https://github.com/HarbourMasters/Shipwright.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Strength name un-greyed out and apply zoom regardless of strength disabled

This commit is contained in:
inspectredc 2023-10-18 21:39:04 +01:00
parent c22d1e724d
commit 9950c02fb2
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_equipment.c
View File

@ -489,11 +489,17 @@ void KaleidoScope_DrawEquipment(PlayState* play) {
}
// Grey Out Strength Upgrade Name when Disabled
// Do not Grey Out Strength Upgrade Name when Enabled
if ((pauseCtx->cursorX[PAUSE_EQUIP] == 0) && (pauseCtx->cursorY[PAUSE_EQUIP] == 2) &&
CVarGetInteger("gToggleStrength", 0) && CVarGetInteger("gStrengthDisabled", 0)) {
pauseCtx->nameColorSet = 1;
CVarGetInteger("gToggleStrength", 0)) {
if (CVarGetInteger("gStrengthDisabled", 0)) {
pauseCtx->nameColorSet = 1;
} else {
pauseCtx->nameColorSet = 0;
}
}
if ((pauseCtx->cursorX[PAUSE_EQUIP] == 0) && (pauseCtx->cursorY[PAUSE_EQUIP] == 0)) {
if (LINK_AGE_IN_YEARS != YEARS_CHILD) {
if ((cursorItem >= ITEM_BULLET_BAG_30) && (cursorItem <= ITEM_BULLET_BAG_50)) {
@ -672,9 +678,9 @@ void KaleidoScope_DrawEquipment(PlayState* play) {
}
}
// Add zoom effect to strength item if cursor is hovering over it and strength is not disabled when the toggle is on
// Add zoom effect to strength item if cursor is hovering over it when toggle option is on
if ((pauseCtx->cursorX[PAUSE_EQUIP] == 0) && (pauseCtx->cursorY[PAUSE_EQUIP] == 2) &&
CVarGetInteger("gToggleStrength", 0) && !CVarGetInteger("gStrengthDisabled", 0)) {
CVarGetInteger("gToggleStrength", 0)) {
i = 2; // row
k = 0; // column
j = 16 * i + 4 * k; // vtx index