diff --git a/goal_src/jak1/engine/game/game-info.gc b/goal_src/jak1/engine/game/game-info.gc index ccda24491e..e116378288 100644 --- a/goal_src/jak1/engine/game/game-info.gc +++ b/goal_src/jak1/engine/game/game-info.gc @@ -440,8 +440,8 @@ (((pickup-type money)) ;; get money. (when (< 0.0 amount) + ;; og:preserve-this make sure any speedrun display is hidden (#when PC_PORT - ;; make sure any speedrun display is hidden (hide-speedrun-display)) ;; play sound. (if (time-elapsed? (-> this money-pickup-time) (seconds 0.05)) (sound-play "money-pickup")) @@ -452,9 +452,8 @@ (let ((s4-2 (the int amount))) (when (not (or (task-complete? (-> (the-as target (-> this process)) game) (the-as game-task s4-2)) (>= (the-as uint 1) (the-as uint s4-2)))) - ;; og:preserve-this + ;; og:preserve-this make sure any speedrun display is hidden (#when PC_PORT - ;; make sure any speedrun display is hidden (hide-speedrun-display)) (set-time! (-> this fuel-cell-pickup-time)))) (adjust (-> (the-as target (-> this process)) game) 'fuel-cell amount source-handle)) @@ -462,9 +461,8 @@ ;; buzzer (let ((buzz-count (adjust (-> (the-as target (-> this process)) game) 'buzzer amount source-handle))) (when (!= buzz-count (-> this buzzer)) - ;; og:preserve-this + ;; og:preserve-this make sure any speedrun display is hidden (#when PC_PORT - ;; make sure any speedrun display is hidden (hide-speedrun-display)) (set-time! (-> this buzzer-pickup-time))) (set! (-> this buzzer) buzz-count)) diff --git a/goal_src/jak1/engine/target/target-death.gc b/goal_src/jak1/engine/target/target-death.gc index 329b59d116..0855eccab7 100644 --- a/goal_src/jak1/engine/target/target-death.gc +++ b/goal_src/jak1/engine/target/target-death.gc @@ -158,7 +158,7 @@ (or (= (get-task-status (game-task beach-ecorocks)) (task-status need-hint)) (= (get-task-status (game-task beach-ecorocks)) (task-status need-introduction))) (#when PC_PORT - (not (is-speedrun-category? 'il-village1))) ;; modified for PC port - skip green sage cutscene in Sandover IL speedrun + (not (is-speedrun-category? 'il-village1))) ;; og:preserve-this skip green sage cutscene in Sandover IL speedrun ) (let ((s5-4 (entity-by-name "sage-23"))) (when s5-4 diff --git a/goal_src/jak1/levels/ogre/ogreboss.gc b/goal_src/jak1/levels/ogre/ogreboss.gc index a52f7c8264..0f5a46c894 100644 --- a/goal_src/jak1/levels/ogre/ogreboss.gc +++ b/goal_src/jak1/levels/ogre/ogreboss.gc @@ -818,7 +818,10 @@ (defstate ogreboss-intro (ogreboss) :code (behavior () - (when (zero? (-> self try-count)) + (when (#if PC_PORT + ;; og:preserve-this skip intro cutscene for Mountain Pass IL speedruns + (and (zero? (-> self try-count)) (not (and PC_PORT (is-speedrun-category? 'il-ogre)))) + (zero? (-> self try-count))) (process-drawable-delay-player (seconds 1)) (let ((gp-0 (get-process *default-dead-pool* pov-camera #x4000))) (ppointer->handle (when gp-0