Don't require input for credits textboxes (#2193)
* Don't require input for credits textboxes * Use cvar instead of rando flag
This commit is contained in:
parent
beb414eb0a
commit
0629140357
|
@ -175,7 +175,8 @@ const std::vector<const char*> enhancementsCvars = {
|
||||||
"gBombchuBowlingAmmunition",
|
"gBombchuBowlingAmmunition",
|
||||||
"gCreditsFix",
|
"gCreditsFix",
|
||||||
"gSilverRupeeJingleExtend",
|
"gSilverRupeeJingleExtend",
|
||||||
"gStaticExplosionRadius"
|
"gStaticExplosionRadius",
|
||||||
|
"gNoInputForCredits",
|
||||||
};
|
};
|
||||||
|
|
||||||
const std::vector<const char*> randomizerCvars = {
|
const std::vector<const char*> randomizerCvars = {
|
||||||
|
@ -617,6 +618,8 @@ const std::vector<PresetEntry> randomizerPresetEntries = {
|
||||||
PRESET_ENTRY_S32("gPauseLiveLink", 16),
|
PRESET_ENTRY_S32("gPauseLiveLink", 16),
|
||||||
// Frames to wait
|
// Frames to wait
|
||||||
PRESET_ENTRY_S32("gMinFrameCount", 200),
|
PRESET_ENTRY_S32("gMinFrameCount", 200),
|
||||||
|
|
||||||
|
PRESET_ENTRY_S32("gNoInputForCredits", 1),
|
||||||
};
|
};
|
||||||
|
|
||||||
const std::vector<PresetEntry> s6PresetEntries = {
|
const std::vector<PresetEntry> s6PresetEntries = {
|
||||||
|
|
|
@ -641,6 +641,8 @@ namespace GameMenuBar {
|
||||||
UIWidgets::Tooltip("Allows graves to be pulled when child during the day");
|
UIWidgets::Tooltip("Allows graves to be pulled when child during the day");
|
||||||
UIWidgets::PaddedEnhancementCheckbox("Dogs follow you everywhere", "gDogFollowsEverywhere", true, false);
|
UIWidgets::PaddedEnhancementCheckbox("Dogs follow you everywhere", "gDogFollowsEverywhere", true, false);
|
||||||
UIWidgets::Tooltip("Allows dogs to follow you anywhere you go, even if you leave the market");
|
UIWidgets::Tooltip("Allows dogs to follow you anywhere you go, even if you leave the market");
|
||||||
|
UIWidgets::PaddedEnhancementCheckbox("Don't require input for Credits sequence", "gNoInputForCredits", true, false);
|
||||||
|
UIWidgets::Tooltip("Removes the input requirement on textboxes after defeating Ganon, allowing Credits sequence to continue to progress");
|
||||||
|
|
||||||
// Blue Fire Arrows
|
// Blue Fire Arrows
|
||||||
bool forceEnableBlueFireArrows = gSaveContext.n64ddFlag &&
|
bool forceEnableBlueFireArrows = gSaveContext.n64ddFlag &&
|
||||||
|
|
|
@ -1180,6 +1180,23 @@ void Message_Decode(PlayState* play) {
|
||||||
while (true) {
|
while (true) {
|
||||||
phi_s1 = temp_s2 = msgCtx->msgBufDecoded[decodedBufPos] = font->msgBuf[msgCtx->msgBufPos];
|
phi_s1 = temp_s2 = msgCtx->msgBufDecoded[decodedBufPos] = font->msgBuf[msgCtx->msgBufPos];
|
||||||
|
|
||||||
|
// Don't require input for credits textboxes in randomizer
|
||||||
|
if (CVarGetInteger("gNoInputForCredits", 0) && (
|
||||||
|
msgCtx->textId == 0x706F ||
|
||||||
|
msgCtx->textId == 0x7091 ||
|
||||||
|
msgCtx->textId == 0x7092 ||
|
||||||
|
msgCtx->textId == 0x7093 ||
|
||||||
|
msgCtx->textId == 0x7094 ||
|
||||||
|
msgCtx->textId == 0x7095
|
||||||
|
)) {
|
||||||
|
if (temp_s2 == MESSAGE_BOX_BREAK) {
|
||||||
|
phi_s1 = temp_s2 = msgCtx->msgBufDecoded[decodedBufPos] = font->msgBuf[msgCtx->msgBufPos] = MESSAGE_BOX_BREAK_DELAYED;
|
||||||
|
} else if (temp_s2 == MESSAGE_END) {
|
||||||
|
phi_s1 = temp_s2 = msgCtx->msgBufDecoded[decodedBufPos] = font->msgBuf[msgCtx->msgBufPos] = MESSAGE_FADE2;
|
||||||
|
phi_s1 = temp_s2 = msgCtx->msgBufDecoded[++decodedBufPos] = font->msgBuf[++msgCtx->msgBufPos] = MESSAGE_END;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
if (temp_s2 == MESSAGE_BOX_BREAK || temp_s2 == MESSAGE_TEXTID || temp_s2 == MESSAGE_BOX_BREAK_DELAYED ||
|
if (temp_s2 == MESSAGE_BOX_BREAK || temp_s2 == MESSAGE_TEXTID || temp_s2 == MESSAGE_BOX_BREAK_DELAYED ||
|
||||||
temp_s2 == MESSAGE_EVENT || temp_s2 == MESSAGE_END) {
|
temp_s2 == MESSAGE_EVENT || temp_s2 == MESSAGE_END) {
|
||||||
// Textbox decoding ends with any of the above text control characters
|
// Textbox decoding ends with any of the above text control characters
|
||||||
|
|
Loading…
Reference in New Issue