diff --git a/goal_src/jak2/engine/level/level.gc b/goal_src/jak2/engine/level/level.gc index 55665f65e6..04f4f95056 100644 --- a/goal_src/jak2/engine/level/level.gc +++ b/goal_src/jak2/engine/level/level.gc @@ -2231,7 +2231,11 @@ into 7 sections, which might explain the weird sizes in the center. (when (not *dproc*) (reset! *load-state*) (let ((s4-1 (level-get-for-use *level* s5-0 'active))) - (let ((a1-11 (new 'stack-no-clear 'array 'symbol 10))) + (let ((a1-11 (new 'stack-no-clear 'array 'symbol LEVEL_MAX))) + (set! (-> a1-11 9) #f) + (set! (-> a1-11 8) #f) + (set! (-> a1-11 7) #f) + (set! (-> a1-11 6) #f) (set! (-> a1-11 5) #f) (set! (-> a1-11 4) #f) (set! (-> a1-11 3) #f) @@ -2997,7 +3001,11 @@ into 7 sections, which might explain the weird sizes in the center. (defun-debug show-level ((arg0 symbol)) (set! (-> *setting-control* user-default border-mode) #t) - (let ((s5-0 (new 'stack-no-clear 'array 'symbol 10))) + (let ((s5-0 (new 'stack-no-clear 'array 'symbol LEVEL_MAX))) + (set! (-> s5-0 9) #f) + (set! (-> s5-0 8) #f) + (set! (-> s5-0 7) #f) + (set! (-> s5-0 6) #f) (set! (-> s5-0 5) #f) (set! (-> s5-0 4) #f) (set! (-> s5-0 3) #f) diff --git a/goal_src/jak2/engine/load/load-state.gc b/goal_src/jak2/engine/load/load-state.gc index cac9fe8310..0451a79765 100644 --- a/goal_src/jak2/engine/load/load-state.gc +++ b/goal_src/jak2/engine/load/load-state.gc @@ -43,7 +43,7 @@ (defmethod want-levels load-state ((obj load-state) (arg0 (pointer symbol))) (dotimes (v1-0 LEVEL_MAX) - (dotimes (a2-0 6) + (dotimes (a2-0 LEVEL_MAX) (when (= (-> obj want v1-0 name) (-> arg0 a2-0)) (set! (-> arg0 a2-0) #f) (goto cfg-8) @@ -52,7 +52,7 @@ (set! (-> obj want v1-0 name) #f) (label cfg-8) ) - (dotimes (v1-3 6) + (dotimes (v1-3 LEVEL_MAX) (when (-> arg0 v1-3) (dotimes (a2-13 LEVEL_MAX) (when (not (-> obj want a2-13 name)) @@ -167,7 +167,7 @@ ;; add 4 symbols to this array per level: name, display, force-vis, force-inside. ;(let ((s5-1 (the-as (array symbol) (new 'stack 'array symbol 24)))) - (let ((symbol-array (new 'stack-no-clear 'array 'symbol 24)) + (let ((symbol-array (new 'stack-no-clear 'array 'symbol 40)) (used-slots 0)) ; (set! (-> s5-1 length) 0) (dotimes (s4-0 LEVEL_MAX) @@ -182,7 +182,7 @@ ;; and add borrows. (let ((v1-34 (lookup-level-info a0-5))) (countdown (a0-6 2) - (when (and (-> v1-34 borrow-level a0-6) (< used-slots 24)) + (when (and (-> v1-34 borrow-level a0-6) (< used-slots 40)) (set! (-> symbol-array used-slots) (-> v1-34 borrow-level a0-6)) (set! (-> symbol-array (+ used-slots 1)) (if (-> obj want s4-0 display?) (-> v1-34 borrow-display? a0-6) diff --git a/goal_src/jak2/levels/demo/demo-obs.gc b/goal_src/jak2/levels/demo/demo-obs.gc index 3ecefc254a..084d611b24 100644 --- a/goal_src/jak2/levels/demo/demo-obs.gc +++ b/goal_src/jak2/levels/demo/demo-obs.gc @@ -571,7 +571,11 @@ (case (scf-get-territory) ((GAME_TERRITORY_SCEI) (demo-screen-change 25 26 #t #f) - (let ((a1-2 (new 'stack-no-clear 'array 'symbol 6))) + (let ((a1-2 (new 'stack-no-clear 'array 'symbol LEVEL_MAX))) + (set! (-> a1-2 9) #f) + (set! (-> a1-2 8) #f) + (set! (-> a1-2 7) #f) + (set! (-> a1-2 6) #f) (set! (-> a1-2 5) #f) (set! (-> a1-2 4) #f) (set! (-> a1-2 3) #f) @@ -687,7 +691,11 @@ (suspend) ) ) - (let ((a1-21 (new 'stack-no-clear 'array 'symbol 6))) + (let ((a1-21 (new 'stack-no-clear 'array 'symbol LEVEL_MAX))) + (set! (-> a1-21 9) #f) + (set! (-> a1-21 8) #f) + (set! (-> a1-21 7) #f) + (set! (-> a1-21 6) #f) (set! (-> a1-21 5) #f) (set! (-> a1-21 4) #f) (set! (-> a1-21 3) #f) diff --git a/goal_src/jak2/levels/title/title-obs.gc b/goal_src/jak2/levels/title/title-obs.gc index 0aee72a06e..d7ba5ea719 100644 --- a/goal_src/jak2/levels/title/title-obs.gc +++ b/goal_src/jak2/levels/title/title-obs.gc @@ -636,7 +636,11 @@ :code (behavior () (let ((v1-1 (-> *game-info* demo-state))) (when (or (zero? v1-1) (= v1-1 1)) - (let ((a1-0 (new 'stack-no-clear 'array 'symbol 6))) + (let ((a1-0 (new 'stack-no-clear 'array 'symbol LEVEL_MAX))) + (set! (-> a1-0 9) #f) + (set! (-> a1-0 8) #f) + (set! (-> a1-0 7) #f) + (set! (-> a1-0 6) #f) (set! (-> a1-0 5) #f) (set! (-> a1-0 4) #f) (set! (-> a1-0 3) #f)