seperate the driftgauge colour patches into extra2 + add some more comments
was an oversight, extra2 should be for all colour hud patches
This commit is contained in:
1 parent
2ec90922a2
commit
010cbd68fd
3 files changed
+26
-6
No files matched your search
+20
-5
@@ -1270,6 +1270,7 @@ boolean achi_speedo_clr = false; // extra speedometer colour check
|
||||
boolean kartz_speedo = false; // kartZ speedo
|
||||
|
||||
boolean clr_hud = false; // colour hud check
|
||||
boolean driftgaugegfx_clr = false; // driftgauge colour check
|
||||
boolean big_lap = false; // bigger lap counter
|
||||
boolean big_lap_color = false; // bigger lap counter but colour
|
||||
boolean statdp = false; // stat display for extended player setup
|
||||
@@ -1451,7 +1452,8 @@ static void D_CheckSaturnExtraFiles(void)
|
||||
nametaggfx = true;
|
||||
}
|
||||
|
||||
if (W_CheckMultipleLumps("K_DGAU","K_DCAU","K_DGSU","K_DCSU", NULL))
|
||||
// driftgauge
|
||||
if (W_CheckMultipleLumps("K_DGAU","K_DGSU", NULL))
|
||||
{
|
||||
driftgaugegfx = true;
|
||||
}
|
||||
@@ -1462,6 +1464,7 @@ static void D_CheckSaturnExtraFiles(void)
|
||||
multiitem_icon = true;
|
||||
}
|
||||
|
||||
// extra round joystick inputdisplay sprites
|
||||
if (W_CheckMultipleLumps("JOYBCK","JOYKNB","JOYSHD", NULL))
|
||||
{
|
||||
joystickicon = true;
|
||||
@@ -1469,25 +1472,34 @@ static void D_CheckSaturnExtraFiles(void)
|
||||
}
|
||||
}
|
||||
|
||||
// now check for colour hud stuff
|
||||
if (found_extra2_kart)
|
||||
{
|
||||
mainwads++;
|
||||
|
||||
// kart vanilla hud patches but colourizable
|
||||
if (W_CheckMultipleLumps("K_SCTIME", "K_SCTIMW", "K_SCLAPS", "K_SCLAPW","K_SCBALN", "K_SCBALW",
|
||||
"K_SCKARM", "K_SCTOUT", "K_ISMULC", "K_ITMULC", "K_ITBC", "K_ITBCD", "K_ISBC", "K_ISBCD", NULL))
|
||||
{
|
||||
clr_hud = true;
|
||||
}
|
||||
|
||||
// extra speedo but colour
|
||||
if (W_LumpExists("SC_SMSTC"))
|
||||
{
|
||||
xtra_speedo_clr = true;
|
||||
}
|
||||
|
||||
// achii speedo but colour
|
||||
if (W_CheckMultipleLumps("SC_AMSTC", "K_TRNULL", "SC_AKMH", "SC_AMPH", "SC_AFRAC", "SC_APERC", NULL))
|
||||
{
|
||||
achi_speedo_clr = true;
|
||||
}
|
||||
|
||||
// now check for colour hud stuff
|
||||
if (W_CheckMultipleLumps("K_SCTIME", "K_SCTIMW", "K_SCLAPS", "K_SCLAPW","K_SCBALN", "K_SCBALW",
|
||||
"K_SCKARM", "K_SCTOUT", "K_ISMULC", "K_ITMULC", "K_ITBC", "K_ITBCD", "K_ISBC", "K_ISBCD", NULL))
|
||||
// driftgauge but colour
|
||||
if (W_CheckMultipleLumps("K_DCAU","K_DCSU", NULL))
|
||||
{
|
||||
clr_hud = true;
|
||||
driftgaugegfx_clr = true;
|
||||
}
|
||||
|
||||
// check for bigger lap count but color** its color bitch
|
||||
@@ -1497,6 +1509,8 @@ static void D_CheckSaturnExtraFiles(void)
|
||||
}
|
||||
}
|
||||
|
||||
// can be used for custom hud stuff
|
||||
// currently used for the v1 beta hud
|
||||
if (found_extra3_kart)
|
||||
{
|
||||
mainwads++;
|
||||
@@ -1509,6 +1523,7 @@ static void D_CheckSaturnExtraFiles(void)
|
||||
PUSHCONS(driftgaugestyle_cons_temp, last_driftgauge_i, 5, "Extra");
|
||||
}
|
||||
|
||||
// 80x11 speedometer crap but colour
|
||||
if (W_LumpExists("SC_SM3TC"))
|
||||
{
|
||||
xtra_speedo_clr3 = true;
|
||||
|
||||
+2
-1
@@ -38,9 +38,10 @@ extern boolean xtra_speedo3; // 80x11 extra speedometer check
|
||||
extern boolean xtra_speedo_clr3; // 80x11 extra speedometer colour check
|
||||
extern boolean achi_speedo; // achiiro speedometer check
|
||||
extern boolean achi_speedo_clr; // extra speedometer colour check
|
||||
extern boolean kartz_speedo; // kartZ speedo
|
||||
extern boolean kartz_speedo; // kartZ speedo
|
||||
|
||||
extern boolean clr_hud; // colour hud check
|
||||
extern boolean driftgaugegfx_clr; // driftgauge colour check
|
||||
extern boolean big_lap; // bigger lap counter
|
||||
extern boolean big_lap_color; // bigger lap counter but colour
|
||||
extern boolean statdp; // stat display for extended player setup
|
||||
|
||||
@@ -7944,6 +7944,10 @@ void K_LoadKartHUDGraphics(void)
|
||||
{
|
||||
driftgauge = W_CachePatchName("K_DGAU", PU_HUDGFX);
|
||||
driftgaugecolor = W_CachePatchName("K_DCAU", PU_HUDGFX);
|
||||
}
|
||||
|
||||
if (driftgaugegfx_clr)
|
||||
{
|
||||
driftgaugesmall = W_CachePatchName("K_DGSU", PU_HUDGFX);
|
||||
driftgaugesmallcolor = W_CachePatchName("K_DCSU", PU_HUDGFX);
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user