thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2026-05-11 03:12:09 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed WANTED poster drawing over minimap, WANTED cursor being colormapped, and splitscreen position shifting stuff

Browse source
This commit is contained in:
Latapostrophe 2019-01-12 12:27:30 +01:00
parent 40140d4372
commit 59c85425e2
1 changed files with 16 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
src/k_kart.c
View file

@ -6275,7 +6275,7 @@ static void K_initKartHUD(void)
LAPS2_X = BASEVIDWIDTH-40; LAPS2_X = BASEVIDWIDTH-40;
LAPS2_Y = (BASEVIDHEIGHT/2)-13; LAPS2_Y = (BASEVIDHEIGHT/2)-13;
POSI2_X = BASEVIDWIDTH -8; POSI2_X = BASEVIDWIDTH -4;
POSI2_Y = (BASEVIDHEIGHT/2)- 16; POSI2_Y = (BASEVIDHEIGHT/2)- 16;
// Reminder that 3P and 4P are just 1P and 2P splitscreen'd to the bottom. // Reminder that 3P and 4P are just 1P and 2P splitscreen'd to the bottom.
@ -6810,6 +6810,7 @@ static void K_DrawKartPositionNum(INT32 num)
//INT32 splitflags = K_calcSplitFlags(V_SNAPTOBOTTOM|V_SNAPTORIGHT); //INT32 splitflags = K_calcSplitFlags(V_SNAPTOBOTTOM|V_SNAPTORIGHT);
INT32 fx = 0, fy = 0, fflags = 0; INT32 fx = 0, fy = 0, fflags = 0;
boolean flipdraw = false; // flip the order we draw it in for MORE splitscreen bs. fun. 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; boolean overtake = false;
if (stplyr->kartstuff[k_positiondelay] || stplyr->exiting) if (stplyr->kartstuff[k_positiondelay] || stplyr->exiting)
@ -6830,6 +6831,8 @@ static void K_DrawKartPositionNum(INT32 num)
{ {
fy = 30; fy = 30;
fflags = V_SNAPTOTOP|V_SNAPTORIGHT; fflags = V_SNAPTOTOP|V_SNAPTORIGHT;
if (overtake)
flipvdraw = true; // make sure overtaking doesn't explode us
} }
else // if we're not p1, that means we're p2. display this at the bottom right, below the minimap. else // if we're not p1, that means we're p2. display this at the bottom right, below the minimap.
{ {
@ -6901,8 +6904,9 @@ static void K_DrawKartPositionNum(INT32 num)
else else
localpatch = kp_positionnum[num % 10][0]; localpatch = kp_positionnum[num % 10][0];
V_DrawFixedPatch((fx<<FRACBITS) + ((overtake && flipdraw) ? ((SHORT)localpatch->width*scale/2) : 0), fy<<FRACBITS, scale, V_HUDTRANSHALF|fflags, localpatch, NULL); V_DrawFixedPatch((fx<<FRACBITS) + ((overtake && flipdraw) ? ((SHORT)localpatch->width*scale/2) : 0), (fy<<FRACBITS) + ((overtake && flipvdraw) ? ((SHORT)localpatch->height*scale/2) : 0), scale, V_HUDTRANSHALF|fflags, localpatch, NULL);
// ^ if we overtake as p1 or p3 in splitscren, we shift it so that it doesn't go off screen. // ^ if we overtake as p1 or p3 in splitscren, we shift it so that it doesn't go off screen.
// ^ if we overtake as p1 in 2p splits, shift vertically so that this doesn't happen either.
fx -= W; fx -= W;
num /= 10; num /= 10;
@ -7530,7 +7534,7 @@ static void K_drawKartMinimapHead(mobj_t *mo, INT32 x, INT32 y, INT32 flags, pat
colormap = R_GetTranslationColormap(skin, mo->color, GTC_CACHE); colormap = R_GetTranslationColormap(skin, mo->color, GTC_CACHE);
V_DrawFixedPatch(amxpos, amypos, FRACUNIT, flags, facemmapprefix[skin], colormap); V_DrawFixedPatch(amxpos, amypos, FRACUNIT, flags, facemmapprefix[skin], colormap);
if (mo->player && K_IsPlayerWanted(mo->player)) if (mo->player && K_IsPlayerWanted(mo->player))
V_DrawFixedPatch(amxpos - (4<<FRACBITS), amypos - (4<<FRACBITS), FRACUNIT, flags, kp_wantedreticle, colormap); V_DrawFixedPatch(amxpos - (4<<FRACBITS), amypos - (4<<FRACBITS), FRACUNIT, flags, kp_wantedreticle, NULL);
} }
} }
@ -8324,6 +8328,15 @@ void K_drawKartHUD(void)
if (cv_kartcheck.value && !splitscreen && !players[displayplayer].exiting) if (cv_kartcheck.value && !splitscreen && !players[displayplayer].exiting)
K_drawKartPlayerCheck(); K_drawKartPlayerCheck();
// Draw WANTED status
if (G_BattleGametype())
{
#ifdef HAVE_BLUA
if (LUA_HudEnabled(hud_wanted))
#endif
K_drawKartWanted();
}
if (cv_kartminimap.value && !titledemo) if (cv_kartminimap.value && !titledemo)
{ {
#ifdef HAVE_BLUA #ifdef HAVE_BLUA
@ -8339,15 +8352,6 @@ void K_drawKartHUD(void)
#endif #endif
K_drawKartItem(); K_drawKartItem();
// Draw WANTED status
if (G_BattleGametype())
{
#ifdef HAVE_BLUA
if (LUA_HudEnabled(hud_wanted))
#endif
K_drawKartWanted();
}
// If not splitscreen, draw... // If not splitscreen, draw...
if (!splitscreen && !titledemo) if (!splitscreen && !titledemo)
{ {