mirror
/
Shipwright
mirror of https://github.com/HarbourMasters/Shipwright.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge dae9adeaaa into 08ad16e750

This commit is contained in:
Jordan Longstaff 2024-05-12 15:20:28 +02:00 committed by GitHub
parent 08ad16e750 dae9adeaaa
commit 47e7b65a8b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
soh/src/code/z_message_PAL.c
View File

@ -835,6 +835,7 @@ void Message_DrawText(PlayState* play, Gfx** gfxP) {
u16 i;
u16 sfxHi;
u16 charTexIdx;
int gTextSpeed;
Font* font = &play->msgCtx.font;
Gfx* gfx = *gfxP;
@ -1115,11 +1116,17 @@ void Message_DrawText(PlayState* play, Gfx** gfxP) {
break;
}
}
if (msgCtx->textDelayTimer == 0) {
msgCtx->textDrawPos = i + CVarGetInteger(CVAR_ENHANCEMENT("TextSpeed"), 2);
gTextSpeed = CVarGetInteger(CVAR_ENHANCEMENT("TextSpeed"), 2);
if (msgCtx->textDelay == 0) {
msgCtx->textDrawPos = i + gTextSpeed;
} else if (msgCtx->textDelayTimer == 0) {
msgCtx->textDrawPos = i + 1;
msgCtx->textDelayTimer = msgCtx->textDelay;
} else if (msgCtx->textDelayTimer <= gTextSpeed) {
msgCtx->textDelayTimer = 0;
} else {
msgCtx->textDelayTimer--;
msgCtx->textDelayTimer -= gTextSpeed;
}
*gfxP = gfx;
}