From bb8b39a5e80399c005584eebf5855f16a7161eae Mon Sep 17 00:00:00 2001 From: Tyler Wilding Date: Wed, 2 Aug 2023 17:44:54 -0600 Subject: [PATCH] jak1: start a new game correctly when speedrunner mode is enabled (#2873) --- goal_src/jak1/engine/ui/progress/progress.gc | 9 ++++----- goal_src/jak1/pc/progress-pc.gc | 9 ++++++--- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/goal_src/jak1/engine/ui/progress/progress.gc b/goal_src/jak1/engine/ui/progress/progress.gc index 07a90d7020..d2617946ea 100644 --- a/goal_src/jak1/engine/ui/progress/progress.gc +++ b/goal_src/jak1/engine/ui/progress/progress.gc @@ -1732,15 +1732,14 @@ (let ((gp-1 (-> *setting-control* default auto-save))) (sound-volume-off) (set! (-> *game-info* mode) 'play) - (initialize! *game-info* 'game (the-as game-save #f) "intro-start") (cond ;; Start a new game differently if speedrunning mode is active ((= (-> *pc-settings* speedrunner-mode?) #t) (speedrun-start-full-game-run)) - ;; start the game normally - (else - (initialize! *game-info* 'game (the-as game-save #f) "intro-start") - (set! (-> *setting-control* default auto-save) gp-1))) + ;; start the game normally + (else + (initialize! *game-info* 'game (the-as game-save #f) "intro-start") + (set! (-> *setting-control* default auto-save) gp-1))) ) (the-as object (set-master-mode 'game)) ) diff --git a/goal_src/jak1/pc/progress-pc.gc b/goal_src/jak1/pc/progress-pc.gc index 72aeccb489..1fe0fad841 100644 --- a/goal_src/jak1/pc/progress-pc.gc +++ b/goal_src/jak1/pc/progress-pc.gc @@ -1937,9 +1937,12 @@ (sound-play "starts-options") (sound-volume-off) (set! (-> *game-info* mode) 'play) - (initialize! *game-info* 'game (the-as game-save #f) "intro-start") - (set-master-mode 'game) - ) + (if (= (-> *pc-settings* speedrunner-mode?) #t) + ;; Start a new game differently if speedrunning mode is active + (speedrun-start-full-game-run) + ;; start the game normally + (initialize! *game-info* 'game (the-as game-save #f) "intro-start")) + (set-master-mode 'game)) (else (sound-play "cursor-options") (set! (-> obj next-display-state) (progress-screen invalid))