thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2026-04-27 20:41:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Rework debugchallenges a little

Browse source 
- Instead of referring to conditionset id, the number you provide is unlockable id (as seen in unlocks.pk3, so plus one).
    - This is preferable because multiple unlocks have the same conditionset.
- Show flashing highlight for the desired unlockable id on the scrollbar, too
    - Different flash to unlock that hasn't been inspected yet
This commit is contained in:
toaster 2024-03-26 21:36:33 +00:00
parent f442f933fc
commit 25da02f0e6
1 changed files with 22 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/k_menudraw.c
View file

@ -6417,9 +6417,9 @@ static void M_DrawChallengeTile(INT16 i, INT16 j, INT32 x, INT32 y, UINT8 *flash
#ifdef DEVELOP #ifdef DEVELOP
if (cv_debugchallenges.value > 0 && if (cv_debugchallenges.value > 0 &&
cv_debugchallenges.value != ref->conditionset) cv_debugchallenges.value != num+1)
{ {
// Searching for a conditionset, fade out any tiles // Searching for an unlockable ID, fade out any tiles
// that don't match. // that don't match.
tileflags = V_80TRANS; tileflags = V_80TRANS;
} }
@ -6749,7 +6749,7 @@ drawborder:
// Display the conditionset for this tile. // Display the conditionset for this tile.
V_DrawThinString(x, y, V_DrawThinString(x, y,
ref->conditionset == cv_debugchallenges.value ? V_AQUAMAP : V_GRAYMAP, ref->conditionset == cv_debugchallenges.value ? V_AQUAMAP : V_GRAYMAP,
va("%u", ref->conditionset)); va("%u", num+1));
} }
#endif #endif
} }
@ -7508,6 +7508,10 @@ static void M_DrawChallengeKeys(INT32 tilex, INT32 tiley)
static void M_DrawChallengeScrollBar(UINT8 *flashmap) static void M_DrawChallengeScrollBar(UINT8 *flashmap)
{ {
#ifdef DEVELOP
extern consvar_t cv_debugchallenges;
#endif
const INT32 bary = 4, barh = 1, hiliw = 1; const INT32 bary = 4, barh = 1, hiliw = 1;
if (!gamedata->challengegrid || !gamedata->challengegridwidth) if (!gamedata->challengegrid || !gamedata->challengegridwidth)
@ -7574,7 +7578,21 @@ static void M_DrawChallengeScrollBar(UINT8 *flashmap)
if (gamedata->challengegrid[i] >= MAXUNLOCKABLES) if (gamedata->challengegrid[i] >= MAXUNLOCKABLES)
continue; continue;
if (gamedata->unlocked[gamedata->challengegrid[i]] && completionamount != -1) #ifdef DEVELOP
if (cv_debugchallenges.value > 0
&& cv_debugchallenges.value == gamedata->challengegrid[i]+1)
{
V_DrawFill(barx + hilix, bary, hiliw, barh, (challengesmenu.ticker & 2) ? 0 : 32);
// The debug fill overrides everything else.
completionamount = -1;
}
#endif
if (completionamount == -1)
continue;
if (gamedata->unlocked[gamedata->challengegrid[i]])
{ {
completionamount += (10/CHALLENGEGRIDHEIGHT); completionamount += (10/CHALLENGEGRIDHEIGHT);