fix minimap offset, connection setting return type

decompiler/config/jak3/all-types.gc

@@ -10841,8 +10841,8 @@
   (:methods
     (new (symbol type int) _type_) ;; 0
     (add-setting (_type_ process symbol object object object) connection) ;; 9
-    (persist-with-delay (_type_ symbol time-frame symbol symbol float int) connection) ;; 10
-    (set-setting (_type_ process symbol object object object) none) ;; 11
+    (persist-with-delay (_type_ symbol time-frame symbol symbol float int) none) ;; 10
+    (set-setting (_type_ process symbol object object object) connection) ;; 11
     (remove-setting (_type_ process symbol) none) ;; 12
     (kill-persister (_type_ engine-pers object) none) ;; 13
     (setting-control-method-14 (_type_ object) connectable) ;; 14

game/overlord/jak2/iso.cpp

@@ -677,7 +677,11 @@ u32 ISOThread() {
       pLVar14 = (VagStrListNode*)NewStreamsList.next;
       do {
         if (pLVar14->id != 0) {
-          QueueVAGStream(pLVar14);
+          if (g_game_version != GameVersion::Jak3) {
+            // doesn't work.
+            printf("jak3 skipping vag stream\n");
+            QueueVAGStream(pLVar14);
+          }
         }
         pLVar14 = (VagStrListNode*)pLVar14->list.next;
         iVar4 = iVar4 + 1;

goal_src/jak3/engine/game/settings-h.gc

@@ -572,9 +572,9 @@
    )
   (:methods
     (new (symbol type int) _type_)
-    (add-setting (_type_ process symbol object object object) none)
+    (add-setting (_type_ process symbol object object object) connection)
     (persist-with-delay (_type_ symbol time-frame symbol symbol float int) none)
-    (set-setting (_type_ process symbol object object object) none)
+    (set-setting (_type_ process symbol object object object) connection)
     (remove-setting (_type_ process symbol) none)
     (kill-persister (_type_ engine-pers object) none)
     (setting-control-method-14 (_type_ object) connectable)

goal_src/jak3/engine/game/settings.gc

@@ -1199,17 +1199,13 @@
   this
   )
 
-;; WARN: Return type mismatch connection vs none.
 (defmethod add-setting ((this setting-control) (arg0 process) (arg1 symbol) (arg2 object) (arg3 object) (arg4 object))
   (add-connection (-> this engine) arg0 arg1 arg2 arg3 arg4)
-  (none)
   )
 
-;; WARN: Return type mismatch connection vs none.
 (defmethod set-setting ((this setting-control) (arg0 process) (arg1 symbol) (arg2 object) (arg3 object) (arg4 object))
   (remove-setting this arg0 arg1)
   (add-connection (-> this engine) arg0 arg1 arg2 arg3 arg4)
-  (none)
   )
 
 (defmethod persist-with-delay ((this setting-control) (arg0 symbol) (arg1 time-frame) (arg2 symbol) (arg3 symbol) (arg4 float) (arg5 int))

goal_src/jak3/engine/target/board/target-board.gc

@@ -866,6 +866,7 @@
   (none)
   )
 
+;; WARN: Return type mismatch connection vs none.
 (defbehavior target-board-init target ()
   (target-lightjak-end-mode #t)
   (target-darkjak-end-mode #t)
@@ -899,7 +900,7 @@
   (set! (-> self board sound-air-knob) 0.0)
   (set! (-> self board sound-bank-knob) 0.0)
   (set! (-> self board turn-sound-id) (new 'static 'sound-id))
-  (set! (-> self board mode-sound-bank) (the-as connection (add-setting! 'mode-sound-bank 'modebord 0.0 0)))
+  (set! (-> self board mode-sound-bank) (add-setting! 'mode-sound-bank 'modebord 0.0 0))
   (set-time! (-> self board board-get-on-time))
   (set! (-> self board stick-lock) #f)
   (set! (-> self board stick-off) #f)

goal_src/jak3/engine/target/flut/target-flut.gc

@@ -1131,7 +1131,7 @@
       (set! (-> self flut attack-id) a0-22)
       )
     (set! (-> self flut flap-sound-id) (the-as uint (new-sound-id)))
-    (set! (-> self flut mode-sound-bank) (the-as connection (add-setting! 'mode-sound-bank 'modeflut 0.0 0)))
+    (set! (-> self flut mode-sound-bank) (add-setting! 'mode-sound-bank 'modeflut 0.0 0))
     (set! (-> self flut entity) #f)
     (let ((v1-41 (handle->process arg0)))
       (if v1-41

goal_src/jak3/engine/target/mech/target-mech.gc

@@ -1368,7 +1368,7 @@
   (set-setting! 'string-min-height 'low (meters 1.5) 0)
   (set-setting! 'fov 'abs (degrees 75.0) 0)
   (set-setting! 'head-offset 'abs (meters 4.5) 0)
-  (set! (-> self mech mode-sound-bank) (the-as connection (add-setting! 'mode-sound-bank 'modemech 0.0 0)))
+  (set! (-> self mech mode-sound-bank) (add-setting! 'mode-sound-bank 'modemech 0.0 0))
   (set! (-> self mech hud 0)
         (ppointer->handle (process-spawn hud-heatmeter :init hud-init-by-other :name "hud-heatmeter" :to self))
         )
@@ -1458,7 +1458,7 @@
           (deactivate a0-27)
           )
       )
-    ;; (setting-control-method-14 *setting-control* (-> self mech mode-sound-bank))
+    (setting-control-method-14 *setting-control* (-> self mech mode-sound-bank))
     (set! (-> self mech mode-sound-bank) #f)
     (logclear! (-> self draw status) (draw-control-status no-draw-bounds))
     (logclear! (-> self focus-status) (focus-status mech))

goal_src/jak3/engine/target/target-darkjak.gc

@@ -997,7 +997,7 @@
     (set! (-> self pending-ext-anim) (target-anim dark))
     (set-time! (-> self fact darkjak-start-time))
     (set! (-> self fact darkjak-effect-time) (seconds 20))
-    (set! (-> self darkjak mode-sound-bank) (the-as connection (add-setting! 'mode-sound-bank 'modedark 0.0 0)))
+    (set! (-> self darkjak mode-sound-bank) (add-setting! 'mode-sound-bank 'modedark 0.0 0))
     (set! (-> self darkjak lightning-count) 0)
     (cond
       ((logtest? (-> self darkjak stage) (darkjak-stage ds8))

goal_src/jak3/engine/target/target-gun.gc

@@ -720,40 +720,40 @@
          ((arg0 pickup-type))
          (case arg0
            (((pickup-type gun-yellow-1))
-            (set! (-> self gun mode-sound-bank) (the-as connection (add-setting! 'mode-sound-bank 'modeguy1 0.0 0)))
+            (set! (-> self gun mode-sound-bank) (add-setting! 'mode-sound-bank 'modeguy1 0.0 0))
             )
            (((pickup-type gun-yellow-2))
-            (set! (-> self gun mode-sound-bank) (the-as connection (add-setting! 'mode-sound-bank 'modeguy2 0.0 0)))
+            (set! (-> self gun mode-sound-bank) (add-setting! 'mode-sound-bank 'modeguy2 0.0 0))
             )
            (((pickup-type gun-yellow-3))
-            (set! (-> self gun mode-sound-bank) (the-as connection (add-setting! 'mode-sound-bank 'modeguy3 0.0 0)))
+            (set! (-> self gun mode-sound-bank) (add-setting! 'mode-sound-bank 'modeguy3 0.0 0))
             )
            (((pickup-type gun-red-1))
-            (set! (-> self gun mode-sound-bank) (the-as connection (add-setting! 'mode-sound-bank 'modegur1 0.0 0)))
+            (set! (-> self gun mode-sound-bank) (add-setting! 'mode-sound-bank 'modegur1 0.0 0))
             )
            (((pickup-type gun-red-2))
-            (set! (-> self gun mode-sound-bank) (the-as connection (add-setting! 'mode-sound-bank 'modegur2 0.0 0)))
+            (set! (-> self gun mode-sound-bank) (add-setting! 'mode-sound-bank 'modegur2 0.0 0))
             )
            (((pickup-type gun-red-3))
-            (set! (-> self gun mode-sound-bank) (the-as connection (add-setting! 'mode-sound-bank 'modegur3 0.0 0)))
+            (set! (-> self gun mode-sound-bank) (add-setting! 'mode-sound-bank 'modegur3 0.0 0))
             )
            (((pickup-type gun-blue-1))
-            (set! (-> self gun mode-sound-bank) (the-as connection (add-setting! 'mode-sound-bank 'modegub1 0.0 0)))
+            (set! (-> self gun mode-sound-bank) (add-setting! 'mode-sound-bank 'modegub1 0.0 0))
             )
            (((pickup-type gun-blue-2))
-            (set! (-> self gun mode-sound-bank) (the-as connection (add-setting! 'mode-sound-bank 'modegub2 0.0 0)))
+            (set! (-> self gun mode-sound-bank) (add-setting! 'mode-sound-bank 'modegub2 0.0 0))
             )
            (((pickup-type gun-blue-3))
-            (set! (-> self gun mode-sound-bank) (the-as connection (add-setting! 'mode-sound-bank 'modegub3 0.0 0)))
+            (set! (-> self gun mode-sound-bank) (add-setting! 'mode-sound-bank 'modegub3 0.0 0))
             )
            (((pickup-type gun-dark-1))
-            (set! (-> self gun mode-sound-bank) (the-as connection (add-setting! 'mode-sound-bank 'modegud1 0.0 0)))
+            (set! (-> self gun mode-sound-bank) (add-setting! 'mode-sound-bank 'modegud1 0.0 0))
             )
            (((pickup-type gun-dark-2))
-            (set! (-> self gun mode-sound-bank) (the-as connection (add-setting! 'mode-sound-bank 'modegud2 0.0 0)))
+            (set! (-> self gun mode-sound-bank) (add-setting! 'mode-sound-bank 'modegud2 0.0 0))
             )
            (((pickup-type gun-dark-3))
-            (set! (-> self gun mode-sound-bank) (the-as connection (add-setting! 'mode-sound-bank 'modegud3 0.0 0)))
+            (set! (-> self gun mode-sound-bank) (add-setting! 'mode-sound-bank 'modegud3 0.0 0))
             )
            )
          (none)

goal_src/jak3/engine/target/target-lightjak.gc

@@ -1571,7 +1571,7 @@
     (set! (-> self pending-ext-anim) (target-anim light))
     (set-time! (-> self fact lightjak-start-time))
     (set! (-> self fact lightjak-effect-time) (seconds 20))
-    (set! (-> self lightjak mode-sound-bank) (the-as connection (add-setting! 'mode-sound-bank 'modelit 0.0 0)))
+    (set! (-> self lightjak mode-sound-bank) (add-setting! 'mode-sound-bank 'modelit 0.0 0))
     (target-start-attack)
     (target-danger-set! 'get-on #f)
     (cond

test/decompiler/reference/jak3/engine/game/settings-h_REF.gc

@@ -700,9 +700,9 @@
    )
   (:methods
     (new (symbol type int) _type_)
-    (add-setting (_type_ process symbol object object object) none)
+    (add-setting (_type_ process symbol object object object) connection)
     (persist-with-delay (_type_ symbol time-frame symbol symbol float int) none)
-    (set-setting (_type_ process symbol object object object) none)
+    (set-setting (_type_ process symbol object object object) connection)
     (remove-setting (_type_ process symbol) none)
     (kill-persister (_type_ engine-pers object) none)
     (setting-control-method-14 (_type_ object) connectable)

test/decompiler/reference/jak3/engine/game/settings_REF.gc

@@ -1186,18 +1186,14 @@
   )
 
 ;; definition for method 9 of type setting-control
-;; WARN: Return type mismatch connection vs none.
 (defmethod add-setting ((this setting-control) (arg0 process) (arg1 symbol) (arg2 object) (arg3 object) (arg4 object))
   (add-connection (-> this engine) arg0 arg1 arg2 arg3 arg4)
-  (none)
   )
 
 ;; definition for method 11 of type setting-control
-;; WARN: Return type mismatch connection vs none.
 (defmethod set-setting ((this setting-control) (arg0 process) (arg1 symbol) (arg2 object) (arg3 object) (arg4 object))
   (remove-setting this arg0 arg1)
   (add-connection (-> this engine) arg0 arg1 arg2 arg3 arg4)
-  (none)
   )
 
 ;; definition for method 10 of type setting-control

test/decompiler/reference/jak3/engine/target/board/target-board_REF.gc

@@ -882,6 +882,7 @@
   )
 
 ;; definition for function target-board-init
+;; WARN: Return type mismatch connection vs none.
 (defbehavior target-board-init target ()
   (target-lightjak-end-mode #t)
   (target-darkjak-end-mode #t)
@@ -915,7 +916,7 @@
   (set! (-> self board sound-air-knob) 0.0)
   (set! (-> self board sound-bank-knob) 0.0)
   (set! (-> self board turn-sound-id) (new 'static 'sound-id))
-  (set! (-> self board mode-sound-bank) (the-as connection (add-setting! 'mode-sound-bank 'modebord 0.0 0)))
+  (set! (-> self board mode-sound-bank) (add-setting! 'mode-sound-bank 'modebord 0.0 0))
   (set-time! (-> self board board-get-on-time))
   (set! (-> self board stick-lock) #f)
   (set! (-> self board stick-off) #f)

test/decompiler/reference/jak3/engine/target/flut/target-flut_REF.gc

@@ -1173,7 +1173,7 @@
       (set! (-> self flut attack-id) a0-22)
       )
     (set! (-> self flut flap-sound-id) (the-as uint (new-sound-id)))
-    (set! (-> self flut mode-sound-bank) (the-as connection (add-setting! 'mode-sound-bank 'modeflut 0.0 0)))
+    (set! (-> self flut mode-sound-bank) (add-setting! 'mode-sound-bank 'modeflut 0.0 0))
     (set! (-> self flut entity) #f)
     (let ((v1-41 (handle->process arg0)))
       (if v1-41

test/decompiler/reference/jak3/engine/target/mech/target-mech_REF.gc

@@ -1413,7 +1413,7 @@
   (set-setting! 'string-min-height 'low (meters 1.5) 0)
   (set-setting! 'fov 'abs (degrees 75.0) 0)
   (set-setting! 'head-offset 'abs (meters 4.5) 0)
-  (set! (-> self mech mode-sound-bank) (the-as connection (add-setting! 'mode-sound-bank 'modemech 0.0 0)))
+  (set! (-> self mech mode-sound-bank) (add-setting! 'mode-sound-bank 'modemech 0.0 0))
   (set! (-> self mech hud 0)
         (ppointer->handle (process-spawn hud-heatmeter :init hud-init-by-other :name "hud-heatmeter" :to self))
         )

test/decompiler/reference/jak3/engine/target/target-darkjak_REF.gc

@@ -1074,7 +1074,7 @@
     (set! (-> self pending-ext-anim) (target-anim dark))
     (set-time! (-> self fact darkjak-start-time))
     (set! (-> self fact darkjak-effect-time) (seconds 20))
-    (set! (-> self darkjak mode-sound-bank) (the-as connection (add-setting! 'mode-sound-bank 'modedark 0.0 0)))
+    (set! (-> self darkjak mode-sound-bank) (add-setting! 'mode-sound-bank 'modedark 0.0 0))
     (set! (-> self darkjak lightning-count) 0)
     (cond
       ((logtest? (-> self darkjak stage) (darkjak-stage ds8))

test/decompiler/reference/jak3/engine/target/target-gun_REF.gc

@@ -727,40 +727,40 @@
          ((arg0 pickup-type))
          (case arg0
            (((pickup-type gun-yellow-1))
-            (set! (-> self gun mode-sound-bank) (the-as connection (add-setting! 'mode-sound-bank 'modeguy1 0.0 0)))
+            (set! (-> self gun mode-sound-bank) (add-setting! 'mode-sound-bank 'modeguy1 0.0 0))
             )
            (((pickup-type gun-yellow-2))
-            (set! (-> self gun mode-sound-bank) (the-as connection (add-setting! 'mode-sound-bank 'modeguy2 0.0 0)))
+            (set! (-> self gun mode-sound-bank) (add-setting! 'mode-sound-bank 'modeguy2 0.0 0))
             )
            (((pickup-type gun-yellow-3))
-            (set! (-> self gun mode-sound-bank) (the-as connection (add-setting! 'mode-sound-bank 'modeguy3 0.0 0)))
+            (set! (-> self gun mode-sound-bank) (add-setting! 'mode-sound-bank 'modeguy3 0.0 0))
             )
            (((pickup-type gun-red-1))
-            (set! (-> self gun mode-sound-bank) (the-as connection (add-setting! 'mode-sound-bank 'modegur1 0.0 0)))
+            (set! (-> self gun mode-sound-bank) (add-setting! 'mode-sound-bank 'modegur1 0.0 0))
             )
            (((pickup-type gun-red-2))
-            (set! (-> self gun mode-sound-bank) (the-as connection (add-setting! 'mode-sound-bank 'modegur2 0.0 0)))
+            (set! (-> self gun mode-sound-bank) (add-setting! 'mode-sound-bank 'modegur2 0.0 0))
             )
            (((pickup-type gun-red-3))
-            (set! (-> self gun mode-sound-bank) (the-as connection (add-setting! 'mode-sound-bank 'modegur3 0.0 0)))
+            (set! (-> self gun mode-sound-bank) (add-setting! 'mode-sound-bank 'modegur3 0.0 0))
             )
            (((pickup-type gun-blue-1))
-            (set! (-> self gun mode-sound-bank) (the-as connection (add-setting! 'mode-sound-bank 'modegub1 0.0 0)))
+            (set! (-> self gun mode-sound-bank) (add-setting! 'mode-sound-bank 'modegub1 0.0 0))
             )
            (((pickup-type gun-blue-2))
-            (set! (-> self gun mode-sound-bank) (the-as connection (add-setting! 'mode-sound-bank 'modegub2 0.0 0)))
+            (set! (-> self gun mode-sound-bank) (add-setting! 'mode-sound-bank 'modegub2 0.0 0))
             )
            (((pickup-type gun-blue-3))
-            (set! (-> self gun mode-sound-bank) (the-as connection (add-setting! 'mode-sound-bank 'modegub3 0.0 0)))
+            (set! (-> self gun mode-sound-bank) (add-setting! 'mode-sound-bank 'modegub3 0.0 0))
             )
            (((pickup-type gun-dark-1))
-            (set! (-> self gun mode-sound-bank) (the-as connection (add-setting! 'mode-sound-bank 'modegud1 0.0 0)))
+            (set! (-> self gun mode-sound-bank) (add-setting! 'mode-sound-bank 'modegud1 0.0 0))
             )
            (((pickup-type gun-dark-2))
-            (set! (-> self gun mode-sound-bank) (the-as connection (add-setting! 'mode-sound-bank 'modegud2 0.0 0)))
+            (set! (-> self gun mode-sound-bank) (add-setting! 'mode-sound-bank 'modegud2 0.0 0))
             )
            (((pickup-type gun-dark-3))
-            (set! (-> self gun mode-sound-bank) (the-as connection (add-setting! 'mode-sound-bank 'modegud3 0.0 0)))
+            (set! (-> self gun mode-sound-bank) (add-setting! 'mode-sound-bank 'modegud3 0.0 0))
             )
            )
          (none)

test/decompiler/reference/jak3/engine/target/target-lightjak_REF.gc

@@ -1617,7 +1617,7 @@
     (set! (-> self pending-ext-anim) (target-anim light))
     (set-time! (-> self fact lightjak-start-time))
     (set! (-> self fact lightjak-effect-time) (seconds 20))
-    (set! (-> self lightjak mode-sound-bank) (the-as connection (add-setting! 'mode-sound-bank 'modelit 0.0 0)))
+    (set! (-> self lightjak mode-sound-bank) (add-setting! 'mode-sound-bank 'modelit 0.0 0))
     (target-start-attack)
     (target-danger-set! 'get-on #f)
     (cond