fix: more general fast load preset

p2sr · Sep 28, 2024 · c7cbb3b · c7cbb3b
1 parent e30dcc5
commit c7cbb3b
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/src/Cheats.cpp b/src/Cheats.cpp
@@ -136,7 +136,7 @@ CON_COMMAND_F_COMPLETION(sar_fast_load_preset, "sar_fast_load_preset <preset> -
 
 #define CMD(x) engine->ExecuteCommand(x)
 	if (!strcmp(preset, "none")) {
-		if (!Game::IsSpeedrunMod()) {
+		if (!Game::IsSpeedrunMod() && ui_loadingscreen_transition_time.ThisPtr()) {
 			CMD("ui_loadingscreen_transition_time 1.0");
 			CMD("ui_loadingscreen_fadein_time 1.0");
 			CMD("ui_loadingscreen_mintransition_time 0.5");
@@ -146,7 +146,7 @@ CON_COMMAND_F_COMPLETION(sar_fast_load_preset, "sar_fast_load_preset <preset> -
 		CMD("sar_loads_uncap 0");
 		CMD("sar_loads_norender 0");
 	} else if (!strcmp(preset, "sla")) {
-		if (!Game::IsSpeedrunMod()) {
+		if (!Game::IsSpeedrunMod() && ui_loadingscreen_transition_time.ThisPtr()) {
 			CMD("ui_loadingscreen_transition_time 0.0");
 			CMD("ui_loadingscreen_fadein_time 0.0");
 			CMD("ui_loadingscreen_mintransition_time 0.0");
@@ -156,7 +156,7 @@ CON_COMMAND_F_COMPLETION(sar_fast_load_preset, "sar_fast_load_preset <preset> -
 		CMD("sar_loads_uncap 0");
 		CMD("sar_loads_norender 0");
 	} else if (!strcmp(preset, "normal")) {
-		if (!Game::IsSpeedrunMod()) {
+		if (!Game::IsSpeedrunMod() && ui_loadingscreen_transition_time.ThisPtr()) {
 			CMD("ui_loadingscreen_transition_time 0.0");
 			CMD("ui_loadingscreen_fadein_time 0.0");
 			CMD("ui_loadingscreen_mintransition_time 0.0");
@@ -166,7 +166,7 @@ CON_COMMAND_F_COMPLETION(sar_fast_load_preset, "sar_fast_load_preset <preset> -
 		CMD("sar_loads_uncap 1");
 		CMD("sar_loads_norender 0");
 	} else if (!strcmp(preset, "full")) {
-		if (!Game::IsSpeedrunMod()) {
+		if (!Game::IsSpeedrunMod() && ui_loadingscreen_transition_time.ThisPtr()) {
 			CMD("ui_loadingscreen_transition_time 0.0");
 			CMD("ui_loadingscreen_fadein_time 0.0");
 			CMD("ui_loadingscreen_mintransition_time 0.0");