Merge branch 'snap-message-drawer' into 'master'

Snap MessageFeed

See merge request kart-krew-dev/ring-racers-internal!2594
This commit is contained in:
Oni VelocitOni 2025-05-29 23:37:25 +00:00
commit f29e6f0327

View file

@ -7146,35 +7146,39 @@ static void K_DrawMessageFeed(void)
text.font(Draw::Font::kMenu); text.font(Draw::Font::kMenu);
UINT8 x = BASEVIDWIDTH/2; UINT32 vw = vid.width / vid.dupx;
UINT8 y = 10; UINT32 vh = vid.height / vid.dupy;
UINT32 x = vw / 2;
UINT32 y = 10;
SINT8 shift = 0; SINT8 shift = 0;
if (r_splitscreen >= 2) if (r_splitscreen >= 2)
{ {
text.font(Draw::Font::kThin); text.font(Draw::Font::kThin);
shift = -2; shift = -2;
x = BASEVIDWIDTH/4; x = vw/4;
y = 5; y = 5;
if (i % 2) if (i % 2)
x += BASEVIDWIDTH/2; x += vw / 2;
if (i >= 2) if (i >= 2)
y += BASEVIDHEIGHT / 2; y += vh / 2;
} }
else if (r_splitscreen >= 1) else if (r_splitscreen >= 1)
{ {
y = 5; y = 5;
if (i >= 1) if (i >= 1)
y += BASEVIDHEIGHT / 2; y += vh / 2;
} }
UINT16 sw = text.width(); UINT16 sw = text.width();
K_DrawSticker(x - sw/2, y, sw, 0, true); K_DrawSticker(x - sw/2, y, sw, V_SNAPTOTOP|V_SNAPTOLEFT, true);
Draw(x, y+shift).align(Draw::Align::kCenter).text(text); Draw(x, y+shift).align(Draw::Align::kCenter).flags(V_SNAPTOTOP|V_SNAPTOLEFT).text(text);
} }
} }