From 301218a1039a651067a524bceccbd970f965235c Mon Sep 17 00:00:00 2001 From: JosJuice Date: Fri, 29 May 2015 21:14:02 +0200 Subject: Volume: Use more appropriate types for some returned values Disc number is changed from bool to u8, and revision is changed from int to u16 (WADs can use all 16 bits, but discs can only use 8 bits). --- Source/Core/DolphinWX/ISOFile.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'Source/Core/DolphinWX/ISOFile.cpp') diff --git a/Source/Core/DolphinWX/ISOFile.cpp b/Source/Core/DolphinWX/ISOFile.cpp index a85586e7d5..3a06c99512 100644 --- a/Source/Core/DolphinWX/ISOFile.cpp +++ b/Source/Core/DolphinWX/ISOFile.cpp @@ -35,7 +35,7 @@ #include "DolphinWX/ISOFile.h" #include "DolphinWX/WxUtils.h" -static const u32 CACHE_REVISION = 0x123; +static const u32 CACHE_REVISION = 0x124; #define DVD_BANNER_WIDTH 96 #define DVD_BANNER_HEIGHT 32 @@ -97,7 +97,7 @@ GameListItem::GameListItem(const std::string& _rFileName) m_UniqueID = pVolume->GetUniqueID(); m_BlobCompressed = DiscIO::IsCompressedBlob(_rFileName); - m_IsDiscTwo = pVolume->IsDiscTwo(); + m_disc_number = pVolume->GetDiscNumber(); m_Revision = pVolume->GetRevision(); std::vector Buffer = pVolume->GetBanner(&m_ImageWidth, &m_ImageHeight); @@ -183,7 +183,7 @@ void GameListItem::DoState(PointerWrap &p) p.Do(m_ImageWidth); p.Do(m_ImageHeight); p.Do(m_Platform); - p.Do(m_IsDiscTwo); + p.Do(m_disc_number); p.Do(m_Revision); } -- cgit v1.2.3