From 9889b638b3b9937c7bca7e9a5ebec8d7f1d2be5c Mon Sep 17 00:00:00 2001 From: Hat Kid <6624576+Hat-Kid@users.noreply.github.com> Date: Tue, 17 Jan 2023 03:18:01 +0100 Subject: [PATCH] jak2: tomb fixes (#2137) --- goal_src/jak2/engine/level/level.gc | 5 +++++ goal_src/jak2/levels/mars_tomb/tomb-obs.gc | 2 ++ 2 files changed, 7 insertions(+) diff --git a/goal_src/jak2/engine/level/level.gc b/goal_src/jak2/engine/level/level.gc index 17bd748a1..23c9fe238 100644 --- a/goal_src/jak2/engine/level/level.gc +++ b/goal_src/jak2/engine/level/level.gc @@ -1345,6 +1345,11 @@ ;; name (set! (-> lev nickname) (the-as string (-> lev bsp nickname))) + ;; added: tombc has the wrong nickname in the bsp file... + (if (and (= (-> lev bsp name) 'tombc) (= (-> lev bsp nickname) 'toa)) + (set! (-> lev nickname) (the-as string 'toc)) + ) + ;; subdivide distances (let ((close-dist (-> lev bsp subdivide-close)) (far-dist (-> lev bsp subdivide-far)) diff --git a/goal_src/jak2/levels/mars_tomb/tomb-obs.gc b/goal_src/jak2/levels/mars_tomb/tomb-obs.gc index 2f97327fc..2a11372e1 100644 --- a/goal_src/jak2/levels/mars_tomb/tomb-obs.gc +++ b/goal_src/jak2/levels/mars_tomb/tomb-obs.gc @@ -1162,6 +1162,7 @@ This commonly includes things such as: - collision information - loading the skeleton group / bones - sounds" + (stack-size-set! (-> obj main-thread) 1024) (let ((s5-0 (new 'process 'collide-shape obj (collide-list-enum usually-hit-by-player)))) (set! (-> s5-0 penetrated-by) (penetrate)) (let ((s4-0 (new 'process 'collide-shape-prim-group s5-0 (the-as uint 2) 0))) @@ -1265,6 +1266,7 @@ This commonly includes things such as: - collision information - loading the skeleton group / bones - sounds" + (stack-size-set! (-> obj main-thread) 1024) (let ((s5-0 (new 'process 'collide-shape obj (collide-list-enum usually-hit-by-player)))) (set! (-> s5-0 penetrated-by) (penetrate)) (let ((s4-0 (new 'process 'collide-shape-prim-group s5-0 (the-as uint 3) 0)))