use colourtranslaions for gametype colours
well depends on if ppl like this idea
This commit is contained in:
1 parent
b3b2425658
commit
ce673eeac1
2 files changed
+15
-6
No files matched your search
@@ -52,6 +52,7 @@
|
||||
#include "md5.h" // demo checksums
|
||||
#include "k_director.h" // SRB2kart
|
||||
#include "k_kart.h" // SRB2kart
|
||||
#include "k_hud.h"
|
||||
#include "k_stats.h" // SRB2kart
|
||||
#include "r_fps.h" // frame interpolation/uncapped
|
||||
|
||||
@@ -2772,6 +2773,19 @@ UINT8 G_SometimesGetDifferentGametype(UINT8 prefgametype)
|
||||
//
|
||||
UINT8 G_GetGametypeColor(INT16 gt)
|
||||
{
|
||||
if (K_UseColorHud())
|
||||
{
|
||||
if (modeattacking // == ATTACKING_RECORD
|
||||
|| gamestate == GS_TIMEATTACK)
|
||||
return colortranslations[K_GetHudColor()][4];
|
||||
if (gt == GT_MATCH)
|
||||
return colortranslations[K_GetHudColor()][11];
|
||||
if (gt == GT_RACE && cv_kartencore.value) // use opposite colour for encore
|
||||
return colortranslations[KartColor_Opposite[K_GetHudColor()*2]][11];
|
||||
|
||||
return colortranslations[K_GetHudColor()][7]; // FALLBACK
|
||||
}
|
||||
|
||||
if (modeattacking // == ATTACKING_RECORD
|
||||
|| gamestate == GS_TIMEATTACK)
|
||||
return orangemap[120];
|
||||
|
||||
+1
-6
@@ -438,14 +438,9 @@ static void ST_drawLevelTitle(void)
|
||||
zonttl = mapheaderinfo[gamemap-1]->zonttl; // SRB2kart
|
||||
actnum = mapheaderinfo[gamemap-1]->actnum;
|
||||
dupcalc = (vid.width/vid.dupx);
|
||||
|
||||
gtc = G_GetGametypeColor(gametype);
|
||||
bary = (splitscreen) ? BASEVIDHEIGHT/2 : 163;
|
||||
|
||||
if (K_UseColorHud() && gametype == GT_RACE)
|
||||
gtc = colortranslations[K_GetHudColor()][7]; // idk if this should also apply to other gametypes?
|
||||
else
|
||||
gtc = G_GetGametypeColor(gametype);
|
||||
|
||||
lvlw = V_LevelNameWidth(lvlttl);
|
||||
|
||||
if (actnum[0])
|
||||
|
||||
Reference in new issue
Block a user