fix tie lod and intro cutscene linux crash (#1794)

open-goal · Aug 23, 2022 · be654b9 · be654b9
1 parent 3dd10d0
commit be654b9
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git 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
@@ -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)
     )
-Original file line number
+Diff line change
@@ Expand Up / @@ -397,6 +397,7 @@ class TieLoadStage : public LoaderStage { @@
                 abort = true;
               }
             }
+            m_next_tree = 0;
           }
           m_wind_indices_done = true;
@@ Expand Down @@