mirror of
https://github.com/KartKrewDev/RingRacers.git
synced 2025-10-30 08:01:28 +00:00
M_DrawChallengeTile: Change the appearance of locked tiles
- Question mark
- If next to an unlocked tile (ie, hint mode)
- Have ring around when highlighted, per hint ring
- ELSE, make blink-colormapped + subtractive
This commit is contained in:
parent
4380876959
commit
e65bb87ec5
1 changed files with 34 additions and 15 deletions
|
|
@ -4538,19 +4538,44 @@ static void M_DrawChallengeTile(INT16 i, INT16 j, INT32 x, INT32 y, boolean hili
|
||||||
unlockedyet = !((gamedata->unlocked[num] == false)
|
unlockedyet = !((gamedata->unlocked[num] == false)
|
||||||
|| (challengesmenu.pending && num == challengesmenu.currentunlock && challengesmenu.unlockanim <= UNLOCKTIME));
|
|| (challengesmenu.pending && num == challengesmenu.currentunlock && challengesmenu.unlockanim <= UNLOCKTIME));
|
||||||
|
|
||||||
|
{
|
||||||
|
UINT32 flags = 0;
|
||||||
|
|
||||||
|
if (challengesmenu.extradata[id].flags != CHE_HINT)
|
||||||
|
{
|
||||||
|
colormap = R_GetTranslationColormap(TC_BLINK, SKINCOLOR_BLACK, GTC_CACHE);
|
||||||
|
flags = V_SUBTRACT|V_90TRANS;
|
||||||
|
}
|
||||||
|
|
||||||
|
pat = W_CachePatchName(
|
||||||
|
va("UN_HNT%c%c",
|
||||||
|
(hili && !colormap) ? '1' : '2',
|
||||||
|
ref->majorunlock ? 'B' : 'A'
|
||||||
|
),
|
||||||
|
PU_CACHE);
|
||||||
|
|
||||||
|
V_DrawFixedPatch(
|
||||||
|
x*FRACUNIT, y*FRACUNIT,
|
||||||
|
FRACUNIT,
|
||||||
|
flags, pat,
|
||||||
|
colormap
|
||||||
|
);
|
||||||
|
|
||||||
|
pat = missingpat;
|
||||||
|
colormap = NULL;
|
||||||
|
}
|
||||||
|
|
||||||
|
// If we aren't unlocked yet, return early.
|
||||||
|
if (!unlockedyet)
|
||||||
|
{
|
||||||
|
goto drawborder;
|
||||||
|
}
|
||||||
|
|
||||||
pat = W_CachePatchName(
|
pat = W_CachePatchName(
|
||||||
(ref->majorunlock ? "UN_BORDB" : "UN_BORDA"),
|
(ref->majorunlock ? "UN_BORDB" : "UN_BORDA"),
|
||||||
PU_CACHE);
|
PU_CACHE);
|
||||||
|
|
||||||
if (!unlockedyet)
|
bgmap = R_GetTranslationColormap(TC_DEFAULT, SKINCOLOR_SILVER, GTC_MENUCACHE);
|
||||||
{
|
|
||||||
UINT16 col = (challengesmenu.extradata[id].flags == CHE_HINT) ? SKINCOLOR_BLUE : SKINCOLOR_BLACK;
|
|
||||||
bgmap = R_GetTranslationColormap(TC_DEFAULT, col, GTC_MENUCACHE);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
bgmap = R_GetTranslationColormap(TC_DEFAULT, SKINCOLOR_SILVER, GTC_MENUCACHE);
|
|
||||||
}
|
|
||||||
|
|
||||||
V_DrawFixedPatch(
|
V_DrawFixedPatch(
|
||||||
x*FRACUNIT, y*FRACUNIT,
|
x*FRACUNIT, y*FRACUNIT,
|
||||||
|
|
@ -4561,12 +4586,6 @@ static void M_DrawChallengeTile(INT16 i, INT16 j, INT32 x, INT32 y, boolean hili
|
||||||
|
|
||||||
pat = missingpat;
|
pat = missingpat;
|
||||||
|
|
||||||
// If we aren't unlocked yet, return early.
|
|
||||||
if (!unlockedyet)
|
|
||||||
{
|
|
||||||
goto drawborder;
|
|
||||||
}
|
|
||||||
|
|
||||||
categoryside = !hili; // temporary
|
categoryside = !hili; // temporary
|
||||||
|
|
||||||
if (categoryside)
|
if (categoryside)
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue