From 5fdbf2e5d6c5dcb2cbd36954d1f6c5b1cb3f2fef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20T=C5=AFma?= <tumic@cbox.cz>
Date: Sun, 10 Oct 2021 08:14:38 +0200
Subject: [PATCH] Code cleanup

---
 src/map/IMG/huffmantable.cpp | 4 ++--
 src/map/IMG/huffmantable.h   | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/map/IMG/huffmantable.cpp b/src/map/IMG/huffmantable.cpp
index 524269b3..ebc37659 100644
--- a/src/map/IMG/huffmantable.cpp
+++ b/src/map/IMG/huffmantable.cpp
@@ -20,7 +20,7 @@ bool HuffmanTable::load(const RGNFile *rgn, SubFile::Handle &rgnHdl)
 		return false;
 
 	_s0 = (quint8)_buffer.at(0) & 0x0F;
-	_s1e = (quint8)_buffer.at(0) & 0x10 ? 1 : 8;
+	_s1e = (quint8)_buffer.at(0) & 0x10;
 	_s2 = (quint8)_buffer.at(1);
 	_s3 = bs(_s2);
 	_s1d = (quint8)_buffer.at(2);
@@ -87,7 +87,7 @@ quint32 HuffmanTable::symbol(quint32 data, quint8 &size) const
 	size = *tp;
 	sym = (data - sym) >> (_s2 - *tp);
 
-	if (_s1e == 8)
+	if (!_s1e)
 		sym = readVUint32(tp, _s20);
 	else {
 		sym = (sym + ss) * _s1f;
diff --git a/src/map/IMG/huffmantable.h b/src/map/IMG/huffmantable.h
index 33fae9fc..7b2803e8 100644
--- a/src/map/IMG/huffmantable.h
+++ b/src/map/IMG/huffmantable.h
@@ -21,8 +21,9 @@ private:
 	HuffmanBuffer _buffer;
 	quint8 _s0, _s1, _s2, _s3;
 	quint8 *_s10, *_s14, *_s18;
-	quint8 _s1c, _s1d, _s1e, _s1f, _s20;
+	quint8 _s1c, _s1d, _s1f, _s20;
 	quint16 _s22;
+	bool _s1e;
 };
 
 }