mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2024-11-25 10:52:19 -05:00
Code Issues Projects Releases Wiki Activity

Fix fast speed skipping quick text markers (#4416)

Browse Source
This commit is contained in:
Jordan Longstaff 2024-10-15 23:50:10 -04:00 committed by GitHub
parent 45af1028af
commit da79e5e015
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -856,6 +856,8 @@ void Message_DrawText(PlayState* play, Gfx** gfxP) {
msgCtx->unk_E3D0 = 0; msgCtx->unk_E3D0 = 0;
charTexIdx = 0; charTexIdx = 0;
gTextSpeed = CVarGetInteger(CVAR_ENHANCEMENT("TextSpeed"), 1);
for (i = 0; i < msgCtx->textDrawPos; i++) { for (i = 0; i < msgCtx->textDrawPos; i++) {
character = msgCtx->msgBufDecoded[i]; character = msgCtx->msgBufDecoded[i];
@ -903,7 +905,7 @@ void Message_DrawText(PlayState* play, Gfx** gfxP) {
*gfxP = gfx; *gfxP = gfx;
return; return;
case MESSAGE_QUICKTEXT_ENABLE: case MESSAGE_QUICKTEXT_ENABLE:
if (i + 1 == msgCtx->textDrawPos && (msgCtx->msgMode == MSGMODE_TEXT_DISPLAYING || if (i < msgCtx->textDrawPos && i + gTextSpeed >= msgCtx->textDrawPos && (msgCtx->msgMode == MSGMODE_TEXT_DISPLAYING ||
(msgCtx->msgMode >= MSGMODE_OCARINA_STARTING && (msgCtx->msgMode >= MSGMODE_OCARINA_STARTING &&
msgCtx->msgMode < MSGMODE_SCARECROW_LONG_RECORDING_START))) { msgCtx->msgMode < MSGMODE_SCARECROW_LONG_RECORDING_START))) {
j = i; j = i;
@ -922,8 +924,10 @@ void Message_DrawText(PlayState* play, Gfx** gfxP) {
break; break;
} }
} }
if (j > msgCtx->textDrawPos) {
i = j - 1; i = j - 1;
msgCtx->textDrawPos = i + 1; msgCtx->textDrawPos = j;
}
if (character) {} if (character) {}
} }
@ -1116,8 +1120,6 @@ void Message_DrawText(PlayState* play, Gfx** gfxP) {
break; break;
} }
} }
gTextSpeed = CVarGetInteger(CVAR_ENHANCEMENT("TextSpeed"), 1);
if (msgCtx->textDelay == 0) { if (msgCtx->textDelay == 0) {
msgCtx->textDrawPos = i + gTextSpeed; msgCtx->textDrawPos = i + gTextSpeed;
} else if (msgCtx->textDelayTimer == 0) { } else if (msgCtx->textDelayTimer == 0) {