From 76ca87f7a92e2c9a5ecf60acd7db9f6fe86e3263 Mon Sep 17 00:00:00 2001
From: Matt Nadareski <mnadareski@outlook.com>
Date: Wed, 25 May 2022 23:52:26 -0700
Subject: [PATCH] Fully fix LZX

---
 BurnOutSharp/External/libmspack/CAB/Decompressor.cs    |  2 +-
 .../External/libmspack/Compression/LZX.ReadHuff.cs     | 10 ----------
 2 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/BurnOutSharp/External/libmspack/CAB/Decompressor.cs b/BurnOutSharp/External/libmspack/CAB/Decompressor.cs
index ba5f34e8..90bbe108 100644
--- a/BurnOutSharp/External/libmspack/CAB/Decompressor.cs
+++ b/BurnOutSharp/External/libmspack/CAB/Decompressor.cs
@@ -632,7 +632,7 @@ namespace LibMSPackSharp.CAB
         {
             State.Offset += (uint)bytes;
             if (State.OutputFileHandle != null)
-                return System.Write(State.OutputFileHandle, buffer, pointer, bytes);
+                return SystemImpl.DefaultSystem.Write(State.OutputFileHandle, buffer, pointer, bytes);
 
             return bytes;
         }
diff --git a/BurnOutSharp/External/libmspack/Compression/LZX.ReadHuff.cs b/BurnOutSharp/External/libmspack/Compression/LZX.ReadHuff.cs
index 7d1824c0..f7846ea0 100644
--- a/BurnOutSharp/External/libmspack/Compression/LZX.ReadHuff.cs
+++ b/BurnOutSharp/External/libmspack/Compression/LZX.ReadHuff.cs
@@ -62,19 +62,9 @@ namespace LibMSPackSharp.Compression
         /// </summary>
         private Error READ_LENGTHS(byte[] lengths, uint first, uint last)
         {
-            int i_ptr = InputPointer;
-            int i_end = InputEnd;
-            uint bit_buffer = BitBuffer;
-            int bits_left = BitsLeft;
-
             if (ReadLens(lengths, first, last) != Error.MSPACK_ERR_OK)
                 return Error;
 
-            InputPointer = i_ptr;
-            InputEnd = i_end;
-            BitBuffer = bit_buffer;
-            BitsLeft = bits_left;
-
             return Error = Error.MSPACK_ERR_OK;
         }