From be654b9398ce3ace70096915072e5456b7d606db Mon Sep 17 00:00:00 2001 From: water111 <48171810+water111@users.noreply.github.com> Date: Tue, 23 Aug 2022 19:14:21 -0400 Subject: [PATCH] fix tie lod and intro cutscene linux crash (#1794) --- game/graphics/opengl_renderer/loader/LoaderStages.cpp | 1 + goal_src/jak1/levels/village1/sequence-a-village1.gc | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/game/graphics/opengl_renderer/loader/LoaderStages.cpp b/game/graphics/opengl_renderer/loader/LoaderStages.cpp index 801a1e2ba3e..e8ca01abb9f 100644 --- a/game/graphics/opengl_renderer/loader/LoaderStages.cpp +++ b/game/graphics/opengl_renderer/loader/LoaderStages.cpp @@ -397,6 +397,7 @@ class TieLoadStage : public LoaderStage { abort = true; } } + m_next_tree = 0; } m_wind_indices_done = true; diff --git a/goal_src/jak1/levels/village1/sequence-a-village1.gc b/goal_src/jak1/levels/village1/sequence-a-village1.gc index cb63f642118..d099f6a5bd2 100644 --- a/goal_src/jak1/levels/village1/sequence-a-village1.gc +++ b/goal_src/jak1/levels/village1/sequence-a-village1.gc @@ -328,10 +328,10 @@ ) :trans (behavior () ;; yeah they messed up a little bit here - (#if PC_PORT - (spool-push *art-control* "sidekick-human-intro-sequence-b" 0 self -1.0) - (spool-push *art-control* "sage-intro-sequence-b" 0 self -1.0) - ) + (spool-push *art-control* "sage-intro-sequence-b" 0 self -1.0) + ;; they should have put this: + ;; (spool-push *art-control* "sidekick-human-intro-sequence-b" 0 self -1.0) + ;; but it somehow causes a crash (maybe linux only?) ((-> (method-of-type process-taskable play-anim) trans)) (none) )