split ra wheel and position number hud offsets
kinda ass due to the preset offset, but will just not apply if either was changed from its original position
This commit is contained in:
1 parent
8fac3fa367
commit
4d37cfba2a
3 files changed
+38
-31
No files matched your search
+12
-11
@@ -148,18 +148,19 @@ extern consvar_t cv_##name##_yoffset;
|
||||
DECL_HUD_OFFSET_X(name)\
|
||||
DECL_HUD_OFFSET_Y(name)
|
||||
|
||||
DECL_HUD_OFFSET(item); // Item box
|
||||
DECL_HUD_OFFSET(time); // Time
|
||||
DECL_HUD_OFFSET(laps); // Number of laps
|
||||
DECL_HUD_OFFSET(dnft); // Countdown (did not finish timer)
|
||||
DECL_HUD_OFFSET(speed); // Speedometer
|
||||
DECL_HUD_OFFSET(posi); // Position in race
|
||||
DECL_HUD_OFFSET(face); // Mini rankings
|
||||
DECL_HUD_OFFSET(stcd); // Starting countdown
|
||||
DECL_HUD_OFFSET(item); // Item box
|
||||
DECL_HUD_OFFSET(time); // Time
|
||||
DECL_HUD_OFFSET(laps); // Number of laps
|
||||
DECL_HUD_OFFSET(dnft); // Countdown (did not finish timer)
|
||||
DECL_HUD_OFFSET(speed); // Speedometer
|
||||
DECL_HUD_OFFSET(posi); // Position in race
|
||||
DECL_HUD_OFFSET(wheel); // RA Wheel
|
||||
DECL_HUD_OFFSET(face); // Mini rankings
|
||||
DECL_HUD_OFFSET(stcd); // Starting countdown
|
||||
DECL_HUD_OFFSET_Y(chek); // Check gfx
|
||||
DECL_HUD_OFFSET(mini); // Minimap
|
||||
DECL_HUD_OFFSET(want); // Wanted
|
||||
DECL_HUD_OFFSET(stat); // Stats
|
||||
DECL_HUD_OFFSET(mini); // Minimap
|
||||
DECL_HUD_OFFSET(want); // Wanted
|
||||
DECL_HUD_OFFSET(stat); // Stats
|
||||
|
||||
#undef DECL_HUD_OFFSET
|
||||
#undef DECL_HUD_OFFSET_X
|
||||
|
||||
+16
-14
@@ -99,18 +99,19 @@ consvar_t cv_##name##_yoffset = {"hud_" #name "_yoffset", "0", CV_SAVE, NULL, NU
|
||||
IMPL_HUD_OFFSET_X(name)\
|
||||
IMPL_HUD_OFFSET_Y(name)
|
||||
|
||||
IMPL_HUD_OFFSET(item); // Item box
|
||||
IMPL_HUD_OFFSET(time); // Time
|
||||
IMPL_HUD_OFFSET(laps); // Number of laps
|
||||
IMPL_HUD_OFFSET(dnft); // Countdown (did not finish timer)
|
||||
IMPL_HUD_OFFSET(speed); // Speedometer
|
||||
IMPL_HUD_OFFSET(posi); // Position in race
|
||||
IMPL_HUD_OFFSET(face); // Mini rankings
|
||||
IMPL_HUD_OFFSET(stcd); // Starting countdown
|
||||
IMPL_HUD_OFFSET(item); // Item box
|
||||
IMPL_HUD_OFFSET(time); // Time
|
||||
IMPL_HUD_OFFSET(laps); // Number of laps
|
||||
IMPL_HUD_OFFSET(dnft); // Countdown (did not finish timer)
|
||||
IMPL_HUD_OFFSET(speed); // Speedometer
|
||||
IMPL_HUD_OFFSET(posi); // Position in race
|
||||
IMPL_HUD_OFFSET(wheel); // RA Wheel
|
||||
IMPL_HUD_OFFSET(face); // Mini rankings
|
||||
IMPL_HUD_OFFSET(stcd); // Starting countdown
|
||||
IMPL_HUD_OFFSET_Y(chek); // Check gfx
|
||||
IMPL_HUD_OFFSET(mini); // Minimap
|
||||
IMPL_HUD_OFFSET(want); // Wanted
|
||||
IMPL_HUD_OFFSET(stat); // Stats
|
||||
IMPL_HUD_OFFSET(mini); // Minimap
|
||||
IMPL_HUD_OFFSET(want); // Wanted
|
||||
IMPL_HUD_OFFSET(stat); // Stats
|
||||
|
||||
#undef IMPL_HUD_OFFSET
|
||||
#undef IMPL_HUD_OFFSET_X
|
||||
@@ -8723,6 +8724,7 @@ static void K_DrawKartPositionNum(INT32 num)
|
||||
// POSI_X = BASEVIDWIDTH - 51; // 269
|
||||
// POSI_Y = BASEVIDHEIGHT- 64; // 136
|
||||
|
||||
const boolean wheeloffs = (cv_showinput.value && cv_posi_xoffset.value == 0 && cv_posi_yoffset.value == 0 && cv_wheel_xoffset.value == 0 && cv_wheel_yoffset.value == 0);
|
||||
boolean win = (stplyr->exiting && num == 1);
|
||||
//INT32 X = POSI_X;
|
||||
INT32 W = SHORT(kp_positionnum[0][0]->width);
|
||||
@@ -8730,7 +8732,7 @@ static void K_DrawKartPositionNum(INT32 num)
|
||||
patch_t *localpatch = kp_positionnum[0][0];
|
||||
//INT32 splitflags = K_calcSplitFlags(V_SNAPTOBOTTOM|V_SNAPTORIGHT);
|
||||
INT32 fx = 0, fy = 0, fflags = 0;
|
||||
INT32 xoffs = (cv_showinput.value) ? -48 : 0;
|
||||
INT32 xoffs = wheeloffs ? -48 : 0;
|
||||
boolean flipdraw = false; // flip the order we draw it in for MORE splitscreen bs. fun.
|
||||
boolean flipvdraw = false; // used only for 2p splitscreen so overtaking doesn't make 1P's position fly off the screen.
|
||||
boolean overtake = false;
|
||||
@@ -8741,7 +8743,7 @@ static void K_DrawKartPositionNum(INT32 num)
|
||||
overtake = true; // this is used for splitscreen stuff in conjunction with flipdraw.
|
||||
}
|
||||
|
||||
if (splitscreen || cv_smallposnum.value || cv_showinput.value)
|
||||
if (splitscreen || cv_smallposnum.value || wheeloffs)
|
||||
scale /= 2;
|
||||
|
||||
W = FixedMul(W<<FRACBITS, scale)>>FRACBITS;
|
||||
@@ -10546,7 +10548,7 @@ static void K_drawInput(void)
|
||||
|
||||
static INT32 pn = 0;
|
||||
INT32 target = 0, splitflags = (V_SNAPTOBOTTOM|V_SNAPTORIGHT|V_HUDTRANS);
|
||||
INT32 x = (BASEVIDWIDTH - 32 + cv_posi_xoffset.value)*FRACUNIT, y = (BASEVIDHEIGHT - 24 + cv_posi_yoffset.value)*FRACUNIT;
|
||||
INT32 x = (BASEVIDWIDTH - 32 + cv_wheel_xoffset.value)*FRACUNIT, y = (BASEVIDHEIGHT - 24 + cv_wheel_yoffset.value)*FRACUNIT;
|
||||
INT32 offs, col;
|
||||
const INT32 accent1 = splitflags|colortranslations[K_GetHudColor()][5];
|
||||
const INT32 accent2 = splitflags|colortranslations[K_GetHudColor()][9];
|
||||
|
||||
+10
-6
@@ -2436,13 +2436,17 @@ static menuitem_t OP_HudOffsetMenu[] =
|
||||
{IT_STRING | IT_CVAR, NULL, "Horizontal Offset", &cv_mini_xoffset, 120},
|
||||
{IT_STRING | IT_CVAR, NULL, "Vertical Offset", &cv_mini_yoffset, 125},
|
||||
|
||||
{IT_HEADER, NULL, "Position / R.A. Wheel", NULL, 135},
|
||||
{IT_STRING | IT_CVAR, NULL, "Horizontal Offset", &cv_posi_xoffset, 140},
|
||||
{IT_STRING | IT_CVAR, NULL, "Vertical Offset", &cv_posi_yoffset, 145},
|
||||
{IT_HEADER, NULL, "Position Number", NULL, 135},
|
||||
{IT_STRING | IT_CVAR, NULL, "Horizontal Offset", &cv_wheel_xoffset, 140},
|
||||
{IT_STRING | IT_CVAR, NULL, "Vertical Offset", &cv_wheel_yoffset, 145},
|
||||
|
||||
{IT_HEADER, NULL, "Stat Display", NULL, 155},
|
||||
{IT_STRING | IT_CVAR, NULL, "Horizontal Offset", &cv_stat_xoffset, 160},
|
||||
{IT_STRING | IT_CVAR, NULL, "Vertical Offset", &cv_stat_yoffset, 165},
|
||||
{IT_HEADER, NULL, "R.A. Wheel", NULL, 155},
|
||||
{IT_STRING | IT_CVAR, NULL, "Horizontal Offset", &cv_posi_xoffset, 160},
|
||||
{IT_STRING | IT_CVAR, NULL, "Vertical Offset", &cv_posi_yoffset, 165},
|
||||
|
||||
{IT_HEADER, NULL, "Stat Display", NULL, 175},
|
||||
{IT_STRING | IT_CVAR, NULL, "Horizontal Offset", &cv_stat_xoffset, 180},
|
||||
{IT_STRING | IT_CVAR, NULL, "Vertical Offset", &cv_stat_yoffset, 185},
|
||||
};
|
||||
|
||||
static menuitem_t OP_SaturnCreditsMenu[] =
|
||||
|
||||
Reference in new issue
Block a user