thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-10-30 08:01:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'status-parse-once' into 'master'

Browse source 
Pre-parse objective messages

See merge request KartKrew/Kart!2291
This commit is contained in:
toaster 2024-04-14 23:04:26 +00:00
commit 3b1bc64c28
1 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/k_hud.cpp
View file

@ -5910,10 +5910,12 @@ void K_AddMessage(const char *msg, boolean interrupt, boolean persist)
if (interrupt) if (interrupt)
state.clear(); state.clear();
std::string parsedmsg = srb2::Draw::TextElement().parse(msg).string();
if (persist) if (persist)
state.objective = msg; state.objective = parsedmsg;
else else
state.add(msg); state.add(parsedmsg);
} }
} }
@ -5940,10 +5942,12 @@ void K_AddMessageForPlayer(player_t *player, const char *msg, boolean interrupt,
if (interrupt) if (interrupt)
state->clear(); state->clear();
std::string parsedmsg = srb2::Draw::TextElement().parse(msg).string();
if (persist) if (persist)
state->objective = msg; state->objective = parsedmsg;
else else
state->add(msg); state->add(parsedmsg);
} }
void K_ClearPersistentMessageForPlayer(player_t *player) void K_ClearPersistentMessageForPlayer(player_t *player)
@ -5997,7 +6001,6 @@ static void K_DrawMessageFeed(void)
Draw::TextElement text(submsg); Draw::TextElement text(submsg);
text.font(Draw::Font::kMenu); text.font(Draw::Font::kMenu);
submsg = text.parse(submsg).string();
UINT8 x = 160; UINT8 x = 160;
UINT8 y = 10; UINT8 y = 10;