diff --git a/src/k_menudraw.c b/src/k_menudraw.c index 7e744557e..a44c74725 100644 --- a/src/k_menudraw.c +++ b/src/k_menudraw.c @@ -7282,12 +7282,14 @@ static void M_DrawChallengeKeys(INT32 tilex, INT32 tiley) fixed_t keyx = (8+offs)*FRACUNIT, keyy = 0; + const boolean keybuttonpress = (menumessage.active == false && M_MenuExtraHeld(pid) == true); + // Button prompt K_drawButton( 24 << FRACBITS, 16 << FRACBITS, 0, kp_button_c[1], - menumessage.active == false && M_MenuExtraHeld(pid) == true + keybuttonpress ); // Metyr of rounds played that contribute to Chao Key generation @@ -7334,6 +7336,20 @@ static void M_DrawChallengeKeys(INT32 tilex, INT32 tiley) } } + // Hand + if (challengesmenu.keywasadded == true) + { + INT32 handx = 32 + 16; + if (keybuttonpress == false) + { + // Only animate if it's the focus + handx -= (skullAnimCounter/5); + } + + V_DrawScaledPatch(handx, 8, V_FLIP, + W_CachePatchName("M_CURSOR", PU_CACHE)); + } + UINT8 keysbeingused = 0; // The Chao Key swooping animation diff --git a/src/menus/extras-challenges.c b/src/menus/extras-challenges.c index 1d6b9704e..4bff594a4 100644 --- a/src/menus/extras-challenges.c +++ b/src/menus/extras-challenges.c @@ -548,6 +548,7 @@ void M_ChallengesTick(void) challengesmenu.chaokeyhold = 0; challengesmenu.unlockcount[CMC_CHAOANIM]++; + challengesmenu.keywasadded = false; // disappearify the Hand S_StartSound(NULL, sfx_chchng);