diff options
| author | engineer124 <47598039+engineer124@users.noreply.github.com> | 2023-11-22 20:19:31 +1100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-11-22 04:19:31 -0500 |
| commit | f2c06ce441a38a032202b9024fdfa57bb36a67c2 (patch) | |
| tree | bb924e2c2b577db8138ac67a6e44a00b5f15b1f8 /src/code/z_message_PAL.c | |
| parent | 2aaa286cf85a51a46bbf1e4ad8f8a36588fd22ad (diff) | |
Misc Cleanup (#1585)
* misc cleanup
* more fake matches
* revert for sym
Diffstat (limited to 'src/code/z_message_PAL.c')
| -rw-r--r-- | src/code/z_message_PAL.c | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/src/code/z_message_PAL.c b/src/code/z_message_PAL.c index 36a1333ed..8313c667a 100644 --- a/src/code/z_message_PAL.c +++ b/src/code/z_message_PAL.c @@ -848,7 +848,7 @@ void Message_HandleOcarina(PlayState* play) { */ void Message_DrawText(PlayState* play, Gfx** gfxP) { MessageContext* msgCtx = &play->msgCtx; - u16 lookAheadCharacter; + s16 pad; u8 character; u16 j; u16 i; @@ -928,15 +928,13 @@ void Message_DrawText(PlayState* play, Gfx** gfxP) { msgCtx->msgMode < MSGMODE_SCARECROW_LONG_RECORDING_START))) { j = i; while (true) { - lookAheadCharacter = msgCtx->msgBufDecoded[j]; - if (lookAheadCharacter == MESSAGE_SHIFT) { + character = msgCtx->msgBufDecoded[j]; + if (character == MESSAGE_SHIFT) { j += 2; - } else if ((lookAheadCharacter != MESSAGE_QUICKTEXT_DISABLE) && - (lookAheadCharacter != MESSAGE_PERSISTENT) && - (lookAheadCharacter != MESSAGE_EVENT) && - (lookAheadCharacter != MESSAGE_BOX_BREAK_DELAYED) && - (lookAheadCharacter != MESSAGE_AWAIT_BUTTON_PRESS) && - (lookAheadCharacter != MESSAGE_BOX_BREAK) && (lookAheadCharacter != MESSAGE_END)) { + } else if ((character != MESSAGE_QUICKTEXT_DISABLE) && (character != MESSAGE_PERSISTENT) && + (character != MESSAGE_EVENT) && (character != MESSAGE_BOX_BREAK_DELAYED) && + (character != MESSAGE_AWAIT_BUTTON_PRESS) && (character != MESSAGE_BOX_BREAK) && + (character != MESSAGE_END)) { j++; } else { break; @@ -944,8 +942,6 @@ void Message_DrawText(PlayState* play, Gfx** gfxP) { } i = j - 1; msgCtx->textDrawPos = i + 1; - - if (character) {} } FALLTHROUGH; case MESSAGE_QUICKTEXT_DISABLE: @@ -1435,7 +1431,6 @@ void Message_Decode(PlayState* play) { digits[2]++; digits[3] -= 10; } - if (curChar) {} loadChar = false; for (i = 0; i < 4; i++) { |