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

[jak2] decomp neon-baron-part, fix merc fog disable (#2443)

Browse Source 
- decompile `neon-baron-part`, which also has the hideout door for some
reason
- improve a few error messages in static data decompilation
- fix bug with disabling fog in merc
This commit is contained in:
water111
2023-03-31 17:47:38 -04:00
committed by GitHub
parent 1b27257e8a
commit 57b5117cae
12 changed files with 8091 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
decompiler/level_extractor/MercData.cpp
+1 -11
View File
@@ -13,7 +13,7 @@ void MercEyeCtrl::from_ref(TypedRef tr, const DecompilerTypeSystem& dts) {
eye_slot = read_plain_data_field<s8>(tr, "eye-slot", dts);
}
void MercCtrlHeader::from_ref(TypedRef tr, const DecompilerTypeSystem& dts, GameVersion version) {
void MercCtrlHeader::from_ref(TypedRef tr, const DecompilerTypeSystem& dts, GameVersion) {
st_magic = read_plain_data_field<u32>(tr, "st-magic", dts);
xyz_scale = read_plain_data_field<float>(tr, "xyz-scale", dts);
st_out_a = read_plain_data_field<u32>(tr, "st-out-a", dts);
@@ -58,16 +58,6 @@ void MercCtrlHeader::from_ref(TypedRef tr, const DecompilerTypeSystem& dts, Game
death_effect = read_plain_data_field<u32>(tr, "death-effect", dts);
use_translucent = read_plain_data_field<u8>(tr, "use-translucent", dts);
display_this_fragment = read_plain_data_field<u8>(tr, "display-this-fragment", dts);
if (version > GameVersion::Jak1) {
disable_fog = read_plain_data_field<u8>(tr, "disable-fog", dts);
use_warp = read_plain_data_field<u8>(tr, "use-warp", dts);
ignore_alpha = read_plain_data_field<u8>(tr, "ignore-alpha", dts);
force_fade = read_plain_data_field<u8>(tr, "force-fade", dts);
disable_envamp = read_plain_data_field<u8>(tr, "disable-envmap", dts);
} else {
disable_fog = false;
}
}
std::string MercCtrlHeader::print() const {