mirror/jak-project
1
0
Fork 0
mirror of https://github.com/open-goal/jak-project synced 2026-07-09 14:55:51 -04:00
Code Issues Packages Projects Releases Wiki Activity

jak3: fix local space particle info crash (#3511)

Browse Source
This commit is contained in:
Hat Kid
2024-05-10 16:14:50 +02:00
committed by GitHub
parent 5b04be2fa0
commit 4dd2bab06e
4 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
decompiler/config/jak3/ntsc_v1/type_casts.jsonc
+1 -1
View File
@@ -4309,7 +4309,7 @@
[6, "v1", "connection"],
[9, "v1", "connection"],
[10, "v1", "connection"],
[11, "t9", "(function object)"],
[11, "t9", "(function particle-local-space-info object)"],
[15, "s5", "connection"],
[[29, 34], "a1", "particle-local-space-info"]
],
game/graphics/opengl_renderer/OpenGLRenderer.cpp
+1 -1
View File
@@ -265,7 +265,7 @@ void OpenGLRenderer::init_bucket_renderers_jak3() {
GET_BUCKET_ID_FOR_LIST(BucketId::MERC_L0_PRIS2, BucketId::MERC_L1_PRIS2, i), m_merc2);
init_bucket_renderer<Generic2BucketRenderer>(
fmt::format("gmerc-l{}-pris2", i), BucketCategory::GENERIC,
GET_BUCKET_ID_FOR_LIST(BucketId::GMERC_L0_PRIS, BucketId::GMERC_L1_PRIS, i), m_generic2,
GET_BUCKET_ID_FOR_LIST(BucketId::GMERC_L0_PRIS2, BucketId::GMERC_L1_PRIS2, i), m_generic2,
Generic2::Mode::NORMAL);
}
goal_src/jak3/engine/gfx/sprite/particles/sparticle-launcher.gc
+5 -1
View File
@@ -920,7 +920,11 @@
(s5-0 (-> (the-as connection v1-2) next0))
)
(while (!= v1-2 (-> gp-0 alive-list-end))
((the-as (function object) (-> (the-as connection v1-2) param0)))
(let ((a0-4 (the-as connection v1-2)))
((the-as (function particle-local-space-info object) (-> (the-as connection v1-2) param0))
(the-as particle-local-space-info a0-4)
)
)
(set! v1-2 s5-0)
(set! s5-0 (-> (the-as connection s5-0) next0))
)
test/decompiler/reference/jak3/engine/gfx/sprite/particles/sparticle-launcher_REF.gc
Generated Vendored
+9 -1
View File
@@ -1266,7 +1266,11 @@
(s5-0 (-> (the-as connection v1-2) next0))
)
(while (!= v1-2 (-> gp-0 alive-list-end))
((the-as (function object) (-> (the-as connection v1-2) param0)))
(let ((a0-4 (the-as connection v1-2)))
((the-as (function particle-local-space-info object) (-> (the-as connection v1-2) param0))
(the-as particle-local-space-info a0-4)
)
)
(set! v1-2 s5-0)
(set! s5-0 (-> (the-as connection s5-0) next0))
)
@@ -3215,3 +3219,7 @@
(none)
)
)