From d3190ec4f11bc2ceac7cf94648f1692fff9f71ed Mon Sep 17 00:00:00 2001
From: Stevoisiak <Stevoisiak@gmail.com>
Date: Mon, 23 Feb 2015 19:48:25 -0500
Subject: [PATCH] VolumeWad: Private variables for offset values

---
 Source/Core/DiscIO/VolumeWad.cpp | 29 ++++++++++++-----------------
 Source/Core/DiscIO/VolumeWad.h   |  2 ++
 2 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/Source/Core/DiscIO/VolumeWad.cpp b/Source/Core/DiscIO/VolumeWad.cpp
index 0e1f0c79b3..0a74312d1a 100644
--- a/Source/Core/DiscIO/VolumeWad.cpp
+++ b/Source/Core/DiscIO/VolumeWad.cpp
@@ -19,8 +19,8 @@
 namespace DiscIO
 {
 CVolumeWAD::CVolumeWAD(IBlobReader* _pReader)
-	: m_pReader(_pReader), m_opening_bnr_offset(0), m_hdr_size(0)
-	, m_cert_size(0), m_tick_size(0), m_tmd_size(0), m_data_size(0)
+	: m_pReader(_pReader), m_offset(0), m_tmd_offset(0), m_opening_bnr_offset(0),
+	m_hdr_size(0), m_cert_size(0), m_tick_size(0), m_tmd_size(0), m_data_size(0)
 {
 	Read(0x00, 4, (u8*)&m_hdr_size);
 	Read(0x08, 4, (u8*)&m_cert_size);
@@ -28,14 +28,16 @@ CVolumeWAD::CVolumeWAD(IBlobReader* _pReader)
 	Read(0x14, 4, (u8*)&m_tmd_size);
 	Read(0x18, 4, (u8*)&m_data_size);
 
-	u32 TmdOffset = ALIGN_40(m_hdr_size) + ALIGN_40(m_cert_size) + ALIGN_40(m_tick_size);
-	m_opening_bnr_offset = TmdOffset + ALIGN_40(m_tmd_size) + ALIGN_40(m_data_size);
+	m_offset = ALIGN_40(m_hdr_size) + ALIGN_40(m_cert_size);
+	m_tmd_offset = ALIGN_40(m_hdr_size) + ALIGN_40(m_cert_size) + ALIGN_40(m_tick_size);
+	m_opening_bnr_offset = m_tmd_offset + ALIGN_40(m_tmd_size) + ALIGN_40(m_data_size);
+
 	// read the last digit of the titleID in the ticket
-	Read(TmdOffset + 0x0193, 1, &m_Country);
+	Read(m_tmd_offset + 0x0193, 1, &m_Country);
 	if (m_Country == 2) // SYSMENU
 	{
 		u16 titlever = 0;
-		Read(TmdOffset + 0x01dc, 2, (u8*)&titlever);
+		Read(m_tmd_offset + 0x01dc, 2, (u8*)&titlever);
 		m_Country = GetSysMenuRegion(Common::swap16(titlever));
 	}
 }
@@ -66,10 +68,9 @@ IVolume::ECountry CVolumeWAD::GetCountry() const
 std::string CVolumeWAD::GetUniqueID() const
 {
 	std::string temp = GetMakerID();
-	u32 Offset = ALIGN_40(m_hdr_size) + ALIGN_40(m_cert_size);
 
 	char GameCode[8];
-	if (!Read(Offset + 0x01E0, 4, (u8*)GameCode))
+	if (!Read(m_offset + 0x01E0, 4, (u8*)GameCode))
 		return "0";
 
 	GameCode[4] = temp.at(0);
@@ -81,11 +82,9 @@ std::string CVolumeWAD::GetUniqueID() const
 
 std::string CVolumeWAD::GetMakerID() const
 {
-	u32 Offset = ALIGN_40(m_hdr_size) + ALIGN_40(m_cert_size) + ALIGN_40(m_tick_size);
-
 	char temp[3] = {1};
 	// Some weird channels use 0x0000 in place of the MakerID, so we need a check there
-	if (!Read(0x198 + Offset, 2, (u8*)temp) || temp[0] == 0 || temp[1] == 0)
+	if (!Read(0x198 + m_tmd_offset, 2, (u8*)temp) || temp[0] == 0 || temp[1] == 0)
 		return "00";
 
 	temp[2] = 0;
@@ -95,9 +94,7 @@ std::string CVolumeWAD::GetMakerID() const
 
 bool CVolumeWAD::GetTitleID(u8* _pBuffer) const
 {
-	u32 Offset = ALIGN_40(m_hdr_size) + ALIGN_40(m_cert_size);
-
-	if (!Read(Offset + 0x01DC, 8, _pBuffer))
+	if (!Read(m_offset + 0x01DC, 8, _pBuffer))
 		return false;
 
 	return true;
@@ -105,10 +102,8 @@ bool CVolumeWAD::GetTitleID(u8* _pBuffer) const
 
 int CVolumeWAD::GetRevision() const
 {
-	u32 TmdOffset = ALIGN_40(m_hdr_size) + ALIGN_40(m_cert_size) + ALIGN_40(m_tick_size);
-
 	u16 revision;
-	if (!m_pReader->Read(TmdOffset + 0x1dc, 2, (u8*)&revision))
+	if (!m_pReader->Read(m_tmd_offset + 0x1dc, 2, (u8*)&revision))
 		return 0;
 
 	return Common::swap16(revision);
diff --git a/Source/Core/DiscIO/VolumeWad.h b/Source/Core/DiscIO/VolumeWad.h
index 0a0f456071..4180e96b5c 100644
--- a/Source/Core/DiscIO/VolumeWad.h
+++ b/Source/Core/DiscIO/VolumeWad.h
@@ -40,6 +40,8 @@ public:
 
 private:
 	std::unique_ptr<IBlobReader> m_pReader;
+	u32 m_offset;
+	u32 m_tmd_offset;
 	u32 m_opening_bnr_offset;
 	u32 m_hdr_size;
 	u32 m_cert_size;