summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMalkierian <malkierian@gmail.com>2024-12-02 16:43:27 -0700
committerAlejandro Asenjo Nitti <96613413+sonicdcer@users.noreply.github.com>2024-12-02 21:07:24 -0300
commit542c756b2e4e0ce56944241577f7e767f25e6a71 (patch)
tree47fb15e3f05c8ca99a9ddce4b77ec22bde378930 /src
parent840fc5617de1997c0d99e1251bc7bfffe691c7e7 (diff)
Add /Zi to release config on win64 for debugging info in release mode.
Revert some of the intro cutscene fix PR, and fix it in a different way.
Diffstat (limited to 'src')
-rw-r--r--src/engine/fox_radio.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/src/engine/fox_radio.c b/src/engine/fox_radio.c
index 9cde4152..91708ad6 100644
--- a/src/engine/fox_radio.c
+++ b/src/engine/fox_radio.c
@@ -572,7 +572,6 @@ void Radio_Draw(void) {
case 32:
if (Audio_GetCurrentVoice() == 0) {
gRadioMsgListIndex++;
- gRadioMsgId = 10 * (gRadioMsgListIndex + 1);
gRadioMsg = SEGMENTED_TO_VIRTUAL(gRadioMsgList[gRadioMsgListIndex]);
Audio_PlayVoice(Message_IdFromPtr(gRadioMsg));
gRadioMsgCharIndex = 0;
@@ -603,16 +602,15 @@ void Radio_Draw(void) {
if (!(fakeTemp)) {
ret = Audio_GetCurrentVoiceStatus();
- if (gRadioMsgId < 50) {
- if (gRadioMsg[gRadioMsgCharIndex + 1] == MSGCHAR_NXT) {
+ if (gRadioMsgCharIndex < 60) {
+ if (gRadioMsg[gRadioMsgCharIndex + 1] == MSGCHAR_NXT && *gRadioMsg != 38) {
if (ret == 0) {
gRadioState = 31;
}
- } else {
+ }
+ else {
gRadioMsgCharIndex++;
}
- } else {
- gRadioMsgCharIndex++;
}
if (sRadioCheckMouthFlag) {