diff --git a/decompiler/level_extractor/merc_replacement.cpp b/decompiler/level_extractor/merc_replacement.cpp index 1cc4205faa..07e2e2d4e9 100644 --- a/decompiler/level_extractor/merc_replacement.cpp +++ b/decompiler/level_extractor/merc_replacement.cpp @@ -131,9 +131,9 @@ void merc_convert_replacement(MercSwapData& out, x.pos[0] = y.x; x.pos[1] = y.y; x.pos[2] = y.z; - x.normal[0] = copy_from.normal[0]; - x.normal[1] = copy_from.normal[1]; - x.normal[2] = copy_from.normal[2]; + x.normal[0] = in.normals.at(i).x(); + x.normal[1] = in.normals.at(i).y(); + x.normal[2] = in.normals.at(i).z(); x.weights[0] = copy_from.weights[0]; x.weights[1] = copy_from.weights[1]; x.weights[2] = copy_from.weights[2]; diff --git a/out/build/Release/bin/decompiler.exe b/out/build/Release/bin/decompiler.exe index 6f14455177..fa126a7f87 100644 Binary files a/out/build/Release/bin/decompiler.exe and b/out/build/Release/bin/decompiler.exe differ diff --git a/out/build/Release/bin/extractor.exe b/out/build/Release/bin/extractor.exe index 4497405545..e4e915ddb8 100644 Binary files a/out/build/Release/bin/extractor.exe and b/out/build/Release/bin/extractor.exe differ diff --git a/out/build/Release/bin/gk.exe b/out/build/Release/bin/gk.exe index 7c091b099d..43d20e98db 100644 Binary files a/out/build/Release/bin/gk.exe and b/out/build/Release/bin/gk.exe differ diff --git a/out/build/Release/bin/goalc.exe b/out/build/Release/bin/goalc.exe index 7972650ff8..a8cd991724 100644 Binary files a/out/build/Release/bin/goalc.exe and b/out/build/Release/bin/goalc.exe differ