autoskip cutscenes when skip major cutscenes is on

This commit is contained in:
gymnast86
2026-05-08 16:21:26 -07:00
parent 38031e2545
commit 9e9f36e484
4 changed files with 9 additions and 2 deletions
+4 -1
View File
@@ -878,7 +878,10 @@ bool dEvt_control_c::skipper() {
}
bool is_trig_skipbtn = mDoCPd_c::getTrigStart(PAD_1);
if (is_trig_skipbtn) {
// Automatically skip cutscenes in rando if Skip Major Cutscenes is on
if (is_trig_skipbtn IF_DUSK(||
(randomizer_IsActive() && canSkip &&
randomizer_GetContext().mSettings[RandomizerContext::SKIP_MAJOR_CUTSCENES] == RandomizerContext::ON))) {
if (mSkipTimer > 0) {
mSkipTimer = -1;
@@ -274,6 +274,8 @@ int RandomizerContext::SettingToEnum(const std::string& settingName) {
{"Hyrule Castle Big Key Hearts", HYRULE_BIG_KEY_HEARTS},
{"Palace of Twilight Requirements", PALACE_OF_TWILIGHT_REQUIREMENTS},
{"Skip Minor Cutscenes", SKIP_MINOR_CUTSCENES},
{"Skip Major Cutscenes", SKIP_MAJOR_CUTSCENES},
};
if (nameToEnum.contains(settingName)) {
@@ -72,6 +72,7 @@ public:
HYRULE_BIG_KEY_DUNGEONS,
PALACE_OF_TWILIGHT_REQUIREMENTS,
SKIP_MINOR_CUTSCENES,
SKIP_MAJOR_CUTSCENES,
};
enum Options {
@@ -315,14 +315,15 @@
- "On": description
- Name: Skip Minor Cutscenes
Tracker Important: True
Need In Game: True
Tracker Important: True
Default Option: "Off"
Options:
- "Off": description
- "On": description
- Name: Skip Major Cutscenes
Need In Game: True
Tracker Important: True
Default Option: "Off"
Options: