thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-12-21 07:22:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'interp-challenges-scrolling' into 'master'

Browse source 
Interpolate scrolling on Challenge Board

See merge request KartKrew/Kart!1782
This commit is contained in:
AJ Martinez 2024-01-04 22:21:45 +00:00
commit fe416626a5
3 changed files with 14 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/k_menu.h
View file

@ -1320,6 +1320,7 @@ extern struct challengesmenu_s {
tic_t ticker; // How long the menu's been open for
INT16 offset; // To make the icons move smoothly when we transition!
menu_anim_t move;
UINT16 currentunlock;
char *unlockcondition;

2
src/k_menudraw.c
View file

@ -6865,6 +6865,8 @@ void M_DrawChallenges(void)
x += challengesmenu.offset;
x += Easing_OutQuad(M_DueFrac(challengesmenu.move.start, 4), challengesgridstep * challengesmenu.move.dist, 0);
if (challengegridloops)
{
if (!challengesmenu.col && challengesmenu.hilix)

11
src/menus/extras-challenges.c
View file

@ -1,6 +1,7 @@
/// \file menus/extras-challenges.c
/// \brief Challenges.
#include "../i_time.h"
#include "../k_menu.h"
#include "../m_cond.h" // Condition Sets
#include "../m_random.h" // And just some randomness for the exits.
@ -882,6 +883,11 @@ boolean M_ChallengesInputs(INT32 ch)
{
challengesmenu.focusx--;
}
else
{
challengesmenu.move.dist = 1;
challengesmenu.move.start = I_GetTime();
}
// Step the actual column right.
if (challengesmenu.col < gamedata->challengegridwidth-1)
@ -919,6 +925,11 @@ boolean M_ChallengesInputs(INT32 ch)
{
challengesmenu.focusx++;
}
else
{
challengesmenu.move.dist = -1;
challengesmenu.move.start = I_GetTime();
}
// Step the actual column left.
if (challengesmenu.col > 0)