vera/nuclide
4
0
Fork 0
Code Issues 32 Pull requests Projects Releases Packages Activity

Client: fix the typewriter text effect timing, where fadein controls the time for each character to fade in.

Browse source
This commit is contained in:
Marco Cawthorne 2023-10-04 07:55:55 -07:00
parent 11797717ef
commit b37893e660
Signed by: eukara
GPG key ID: CE2032F0A2882A22
1 changed files with 13 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/client/text.qc
View file

@ -91,6 +91,11 @@ GameText_DrawMessage(gametext_t *txt, float timer, int highlight)
txt->m_flHoldTime;
}
if (txt->m_iEffect == 2) {
mtime = (strlen(txt->m_strMessage) * txt->m_flFadeIn) + txt->m_flHoldTime;
btime = mtime + txt->m_flFadeOut;
}
if (timer > mtime) {
return;
}
@ -185,7 +190,14 @@ GameText_Draw(void)
g_textqueue[0].m_flTime += clframetime;
float maxTime = g_textqueue[0].m_flFadeIn + g_textqueue[0].m_flFadeOut + g_textqueue[0].m_flHoldTime + g_textqueue[0].m_flFXTime;
float maxTime;
if (g_textqueue[0].m_iEffect == 2) {
float charCount = strlen(g_textqueue[0].m_strMessage);
maxTime = (charCount * g_textqueue[0].m_flFadeIn) + g_textqueue[0].m_flFadeOut + g_textqueue[0].m_flHoldTime + g_textqueue[0].m_flFXTime;
} else {
maxTime = g_textqueue[0].m_flFadeIn + g_textqueue[0].m_flFadeOut + g_textqueue[0].m_flHoldTime + g_textqueue[0].m_flFXTime;
}
if (g_textqueue[0].m_flTime >= maxTime)
g_textqueue[0].m_strMessage = __NULL__;