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

DiscIO: Fix extra tabs in the banner loader headers

Browse Source
This commit is contained in:
Lioncash
2014-06-29 15:31:44 -04:00
parent 91da031220
commit d800b5fb74
3 changed files with 95 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
Source/Core/DiscIO/BannerLoaderWii.h
View File

@ -18,54 +18,52 @@ class IVolume;
class CBannerLoaderWii
: public IBannerLoader
{
public:
public:
CBannerLoaderWii(DiscIO::IVolume *pVolume);
CBannerLoaderWii(DiscIO::IVolume *pVolume);
virtual ~CBannerLoaderWii();
virtual ~CBannerLoaderWii();
virtual bool IsValid() override;
virtual bool IsValid() override;
virtual std::vector<u32> GetBanner(int* pWidth, int* pHeight) override;
virtual std::vector<u32> GetBanner(int* pWidth, int* pHeight) override;
virtual std::vector<std::string> GetNames() override;
virtual std::string GetCompany() override;
virtual std::vector<std::string> GetDescriptions() override;
virtual std::vector<std::string> GetNames() override;
virtual std::string GetCompany() override;
virtual std::vector<std::string> GetDescriptions() override;
private:
enum
{
TEXTURE_SIZE = 192 * 64 * 2,
ICON_SIZE = 48 * 48 * 2,
COMMENT_SIZE = 32
};
private:
enum CommentIndex
{
NAME_IDX,
DESC_IDX
};
enum
{
TEXTURE_SIZE = 192 * 64 * 2,
ICON_SIZE = 48 * 48 * 2,
COMMENT_SIZE = 32
};
struct SWiiBanner
{
u32 ID;
enum CommentIndex
{
NAME_IDX,
DESC_IDX
};
u32 m_Flag;
u16 m_Speed;
u8 m_Unknown[22];
struct SWiiBanner
{
u32 ID;
// Not null terminated!
u16 m_Comment[2][COMMENT_SIZE];
u8 m_BannerTexture[TEXTURE_SIZE];
u8 m_IconTexture[8][ICON_SIZE];
} ;
u32 m_Flag;
u16 m_Speed;
u8 m_Unknown[22];
u8* m_pBannerFile;
// Not null terminated!
u16 m_Comment[2][COMMENT_SIZE];
u8 m_BannerTexture[TEXTURE_SIZE];
u8 m_IconTexture[8][ICON_SIZE];
} ;
bool m_IsValid;
u8* m_pBannerFile;
bool m_IsValid;
bool GetStringFromComments(const CommentIndex index, std::string& s);
bool GetStringFromComments(const CommentIndex index, std::string& s);
};
} // namespace