From 37af812785cad478e9a6f9c4cebbd1bb290f1382 Mon Sep 17 00:00:00 2001
From: Hat Kid <6624576+Hat-Kid@users.noreply.github.com>
Date: Mon, 3 Apr 2023 23:02:38 +0200
Subject: [PATCH] jak2: add some temporary `gui-control` hacks to make missions
 completable (#2454)

---
 goal_src/jak2/levels/atoll/sig0-course.gc        | 3 ++-
 goal_src/jak2/levels/castle/boss/castle-baron.gc | 7 ++++---
 goal_src/jak2/levels/dig/dig-obs.gc              | 7 ++++---
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/goal_src/jak2/levels/atoll/sig0-course.gc b/goal_src/jak2/levels/atoll/sig0-course.gc
index 497559e80a..8814c71745 100644
--- a/goal_src/jak2/levels/atoll/sig0-course.gc
+++ b/goal_src/jak2/levels/atoll/sig0-course.gc
@@ -2582,7 +2582,8 @@
         :on-update (lambda ((arg0 sig-atoll))
           (with-pp
             (cond
-              ((not (speech-playing? arg0 27))
+              ;; TODO remove when VAG streams work
+              (#f ;; ((not (speech-playing? arg0 27))
                (if (>= (- (-> pp clock frame-counter) (-> arg0 waypoint-time0)) (seconds 0.5))
                    (play-speech arg0 27)
                    )
diff --git a/goal_src/jak2/levels/castle/boss/castle-baron.gc b/goal_src/jak2/levels/castle/boss/castle-baron.gc
index e6130f750a..354ed36dd7 100644
--- a/goal_src/jak2/levels/castle/boss/castle-baron.gc
+++ b/goal_src/jak2/levels/castle/boss/castle-baron.gc
@@ -3313,9 +3313,10 @@ For example for an elevator pre-compute the distance between the first and last
       (ja-eval)
       (suspend)
       )
-    (while (nonzero? (get-status *gui-control* (the-as sound-id (-> self id))))
-      (suspend)
-      )
+    ;; TODO uncomment when VAG streams work
+    ;; (while (nonzero? (get-status *gui-control* (the-as sound-id (-> self id))))
+    ;;   (suspend)
+    ;;   )
     (set! (-> self movie-handle) (ppointer->handle (process-spawn
                                                      scene-player
                                                      :init scene-player-init
diff --git a/goal_src/jak2/levels/dig/dig-obs.gc b/goal_src/jak2/levels/dig/dig-obs.gc
index 6ee5fcda83..34694c7771 100644
--- a/goal_src/jak2/levels/dig/dig-obs.gc
+++ b/goal_src/jak2/levels/dig/dig-obs.gc
@@ -562,9 +562,10 @@
           (suspend)
           (set! v1-12 (and *target* (not (focus-test? *target* in-air)) (process-grab? *target* #f)))
           )
-        (while (!= (get-status *gui-control* s5-0) (gui-status ready))
-          (suspend)
-          )
+        ;; TODO uncomment when VAG streams work
+        ;; (while (!= (get-status *gui-control* s5-0) (gui-status ready))
+        ;;   (suspend)
+        ;;   )
         (set! (-> self state-time) (-> self clock frame-counter))
         (until (>= (- (-> self clock frame-counter) (-> self state-time)) (seconds 0.2))
           (suspend)