mirror/jak-project
1
0
Fork 0
mirror of https://github.com/open-goal/jak-project synced 2026-06-25 02:02:08 -04:00
Code Issues Packages Projects Releases Wiki Activity

[decommp] generic-obs (#2013)

Browse Source
This commit is contained in:
water111
2022-11-12 17:56:07 -05:00
committed by GitHub
parent 84ef64398e
commit f39b993f79
165 changed files with 12536 additions and 6261 deletions
Download Patch File Download Diff File Expand all files Collapse all files
decompiler/analysis/insert_lets.cpp
+17 -3
View File
@@ -907,6 +907,15 @@ FormElement* rewrite_as_case_no_else(LetElement* in, const Env& env, FormPool& p
}
auto* cond = in->body()->try_as_element<CondNoElseElement>();
std::optional<TypeSpec> cast_type;
if (!cond) {
auto* casted = in->body()->try_as_element<CastElement>();
if (casted) {
cast_type = casted->type();
cond = casted->source()->try_as_element<CondNoElseElement>();
}
}
if (!cond) {
return nullptr;
}
@@ -972,8 +981,12 @@ FormElement* rewrite_as_case_no_else(LetElement* in, const Env& env, FormPool& p
return nullptr;
}
return pool.alloc_element<CaseElement>(in->entries().at(0).src, entries, nullptr);
return nullptr;
auto* case_elt = pool.alloc_element<CaseElement>(in->entries().at(0).src, entries, nullptr);
if (cast_type) {
return pool.alloc_element<CastElement>(*cast_type, pool.alloc_single_form(nullptr, case_elt));
} else {
return case_elt;
}
}
FormElement* rewrite_as_case_with_else(LetElement* in, const Env& env, FormPool& pool) {
@@ -1496,7 +1509,8 @@ FormElement* rewrite_proc_new(LetElement* in, const Env& env, FormPool& pool) {
args.push_back(as_func->elts().at(1));
} else {
auto init_func = as_func->elts().at(1)->to_form(env);
if (init_func.is_symbol("manipy-init") && proc_type == "manipy") {
if (init_func.is_symbol("manipy-init") && proc_type == "manipy" &&
env.version == GameVersion::Jak1) {
head = "manipy-spawn";
} else {
args.push_back(pool.form<ConstantTokenElement>(proc_type));