mirror of
https://github.com/HarbourMasters/Shipwright.git
synced 2024-10-31 23:55:06 -04:00
Fix fast speed skipping quick text markers (#4416)
This commit is contained in:
parent
45af1028af
commit
da79e5e015
@ -856,6 +856,8 @@ void Message_DrawText(PlayState* play, Gfx** gfxP) {
|
||||
msgCtx->unk_E3D0 = 0;
|
||||
charTexIdx = 0;
|
||||
|
||||
gTextSpeed = CVarGetInteger(CVAR_ENHANCEMENT("TextSpeed"), 1);
|
||||
|
||||
for (i = 0; i < msgCtx->textDrawPos; i++) {
|
||||
character = msgCtx->msgBufDecoded[i];
|
||||
|
||||
@ -903,9 +905,9 @@ void Message_DrawText(PlayState* play, Gfx** gfxP) {
|
||||
*gfxP = gfx;
|
||||
return;
|
||||
case MESSAGE_QUICKTEXT_ENABLE:
|
||||
if (i + 1 == msgCtx->textDrawPos && (msgCtx->msgMode == MSGMODE_TEXT_DISPLAYING ||
|
||||
(msgCtx->msgMode >= MSGMODE_OCARINA_STARTING &&
|
||||
msgCtx->msgMode < MSGMODE_SCARECROW_LONG_RECORDING_START))) {
|
||||
if (i < msgCtx->textDrawPos && i + gTextSpeed >= msgCtx->textDrawPos && (msgCtx->msgMode == MSGMODE_TEXT_DISPLAYING ||
|
||||
(msgCtx->msgMode >= MSGMODE_OCARINA_STARTING &&
|
||||
msgCtx->msgMode < MSGMODE_SCARECROW_LONG_RECORDING_START))) {
|
||||
j = i;
|
||||
while (true) {
|
||||
lookAheadCharacter = msgCtx->msgBufDecoded[j];
|
||||
@ -922,8 +924,10 @@ void Message_DrawText(PlayState* play, Gfx** gfxP) {
|
||||
break;
|
||||
}
|
||||
}
|
||||
i = j - 1;
|
||||
msgCtx->textDrawPos = i + 1;
|
||||
if (j > msgCtx->textDrawPos) {
|
||||
i = j - 1;
|
||||
msgCtx->textDrawPos = j;
|
||||
}
|
||||
|
||||
if (character) {}
|
||||
}
|
||||
@ -1116,8 +1120,6 @@ void Message_DrawText(PlayState* play, Gfx** gfxP) {
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
gTextSpeed = CVarGetInteger(CVAR_ENHANCEMENT("TextSpeed"), 1);
|
||||
if (msgCtx->textDelay == 0) {
|
||||
msgCtx->textDrawPos = i + gTextSpeed;
|
||||
} else if (msgCtx->textDelayTimer == 0) {
|
||||
|
Loading…
Reference in New Issue
Block a user