thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2026-05-10 02:41:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

M_OptionsTick: Instant transmission

Browse source 
If a menu fade has occurred, perform the relevant offsetting imemdiately, no smooth animation.
This commit is contained in:
toaster 2023-11-29 19:36:17 +00:00
parent cff207e7aa
commit fd0466a8df
1 changed files with 28 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
src/menus/options-1.c
View file

@ -135,16 +135,22 @@ boolean M_OptionsQuit(void)
void M_OptionsTick(void) void M_OptionsTick(void)
{ {
optionsmenu.offset /= 2; boolean instanttransmission = optionsmenu.ticker == 0 && menuwipe;
optionsmenu.ticker++; optionsmenu.ticker++;
optionsmenu.optx += (optionsmenu.toptx - optionsmenu.optx)/2; if (!instanttransmission)
optionsmenu.opty += (optionsmenu.topty - optionsmenu.opty)/2;
if (abs(optionsmenu.optx - optionsmenu.opty) < 2)
{ {
optionsmenu.optx = optionsmenu.toptx; optionsmenu.offset /= 2;
optionsmenu.opty = optionsmenu.topty; // Avoid awkward 1 px errors.
optionsmenu.optx += (optionsmenu.toptx - optionsmenu.optx)/2;
optionsmenu.opty += (optionsmenu.topty - optionsmenu.opty)/2;
if (abs(optionsmenu.optx - optionsmenu.opty) < 2)
{
optionsmenu.optx = optionsmenu.toptx;
optionsmenu.opty = optionsmenu.topty; // Avoid awkward 1 px errors.
}
} }
// Move the button for cool animations // Move the button for cool animations
@ -177,8 +183,21 @@ void M_OptionsTick(void)
optionsmenu.fade--; optionsmenu.fade--;
// change the colour if we aren't matching the current menu colour // change the colour if we aren't matching the current menu colour
if (optionsmenu.currcolour != currentMenu->extra1) if (instanttransmission)
M_OptionsChangeBGColour(currentMenu->extra1); {
optionsmenu.currcolour = currentMenu->extra1;
optionsmenu.offset = optionsmenu.fade = 0;
optionsmenu.optx = optionsmenu.toptx;
optionsmenu.opty = optionsmenu.topty;
}
else
{
if (optionsmenu.fade)
optionsmenu.fade--;
if (optionsmenu.currcolour != currentMenu->extra1)
M_OptionsChangeBGColour(currentMenu->extra1);
}
// And one last giggle... // And one last giggle...
if (shitsfree) if (shitsfree)