piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-23 06:09:50 -06:00
Code Issues Packages Projects Releases Wiki Activity

Volume: Use more appropriate types for some returned values

Browse Source 
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).
This commit is contained in:
JosJuice
2015-05-29 21:14:02 +02:00
parent d1d284e784
commit 301218a103
15 changed files with 54 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Source/Core/DolphinWX/ISOFile.h
View File

@ -31,7 +31,7 @@ public:
std::string GetDescription() const;
std::vector<DiscIO::IVolume::ELanguage> GetLanguages() const;
std::string GetCompany() const;
int GetRevision() const { return m_Revision; }
u16 GetRevision() const { return m_Revision; }
const std::string& GetUniqueID() const {return m_UniqueID;}
const std::string GetWiiFSPath() const;
DiscIO::IVolume::ECountry GetCountry() const {return m_Country;}
@ -41,7 +41,8 @@ public:
bool IsCompressed() const {return m_BlobCompressed;}
u64 GetFileSize() const {return m_FileSize;}
u64 GetVolumeSize() const {return m_VolumeSize;}
bool IsDiscTwo() const {return m_IsDiscTwo;}
// 0 is the first disc, 1 is the second disc
u8 GetDiscNumber() const {return m_disc_number;}
#if defined(HAVE_WX) && HAVE_WX
const wxBitmap& GetBitmap() const {return m_Bitmap;}
#endif
@ -73,7 +74,7 @@ private:
DiscIO::IVolume::ECountry m_Country;
int m_Platform;
int m_Revision;
u16 m_Revision;
#if defined(HAVE_WX) && HAVE_WX
wxBitmap m_Bitmap;
@ -82,7 +83,7 @@ private:
bool m_BlobCompressed;
std::vector<u8> m_pImage;
int m_ImageWidth, m_ImageHeight;
bool m_IsDiscTwo;
u8 m_disc_number;
bool LoadFromCache();
void SaveToCache();