decompiler: fix secret-disable form in defskelgroup detection (#3713

)
open-goal · Oct 14, 2024 · c623190 · c623190
1 parent a7a7110
commit c623190
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/decompiler/IR2/Form.cpp b/decompiler/IR2/Form.cpp
@@ -3175,7 +3175,7 @@ goos::Object DefskelgroupElement::ClothParams::to_list(const std::string& ag_nam
                                   pretty_print::to_symbol(std::to_string(timestep_freq))}));
   }
   if (secret != 0) {
-    auto bits = decompile_bitfield_enum_from_int(TypeSpec("game-secrets"), env.dts->ts, flags);
+    auto bits = decompile_bitfield_enum_from_int(TypeSpec("game-secrets"), env.dts->ts, secret);
     result.push_back(pretty_print::build_list(
         {pretty_print::to_symbol("secret-disable"),
          pretty_print::to_symbol(fmt::format("(game-secrets {})", fmt::join(bits, " ")))}));

diff --git a/goal_src/jak3/engine/common-obs/scene-actor.gc b/goal_src/jak3/engine/common-obs/scene-actor.gc
@@ -469,7 +469,7 @@
                 (drag 0.151)
                 (num-iterations 1)
                 (timestep-frequency 7)
-                (secret-disable (game-secrets scene-player-1 scene-player-3))
+                (secret-disable (game-secrets kleever-diaper))
                 )
                ((mesh kleever-highres-kleever-R1-cg)
                 (gravity-constant (meters 24))
@@ -484,7 +484,7 @@
                 (drag 0.151)
                 (num-iterations 1)
                 (timestep-frequency 7)
-                (secret-disable (game-secrets scene-player-1 scene-player-3))
+                (secret-disable (game-secrets kleever-diaper))
                 )
                ((mesh kleever-highres-kleever-Center-cg)
                 (gravity-constant (meters 24))
@@ -499,7 +499,7 @@
                 (drag 0.151)
                 (num-iterations 1)
                 (timestep-frequency 7)
-                (secret-disable (game-secrets scene-player-1 scene-player-3))
+                (secret-disable (game-secrets kleever-diaper))
                 )
                ((mesh kleever-highres-kleever-L2-cg)
                 (gravity-constant (meters 12))
@@ -514,7 +514,7 @@
                 (drag 0.151)
                 (num-iterations 1)
                 (timestep-frequency 7)
-                (secret-disable (game-secrets scene-player-1 scene-player-3))
+                (secret-disable (game-secrets kleever-diaper))
                 )
                ((mesh kleever-highres-kleever-R2-cg)
                 (gravity-constant (meters 12))
@@ -529,7 +529,7 @@
                 (drag 0.151)
                 (num-iterations 1)
                 (timestep-frequency 7)
-                (secret-disable (game-secrets scene-player-1 scene-player-3))
+                (secret-disable (game-secrets kleever-diaper))
                 )
                )
               )