diff options
| author | Markus Wick <degasus@users.noreply.github.com> | 2015-12-15 18:48:49 +0100 |
|---|---|---|
| committer | Markus Wick <degasus@users.noreply.github.com> | 2015-12-15 18:48:49 +0100 |
| commit | c310b3f0e6881d6933d9514ec03b53a9c89e3c54 (patch) | |
| tree | 2bd0b05d5f0276a029dbba1960580de27be76630 /Source/Core/DiscIO/VolumeCommon.cpp | |
| parent | 2990df3f593c973addec1293e3a692d27a6e5d23 (diff) | |
| parent | a0cd753060fb8b2701c4e1733cc56da4523f852c (diff) | |
Merge pull request #3309 from JosJuice/reload-banner-without-volume
Don't read from volume when reloading Wii banners
Diffstat (limited to 'Source/Core/DiscIO/VolumeCommon.cpp')
| -rw-r--r-- | Source/Core/DiscIO/VolumeCommon.cpp | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/Source/Core/DiscIO/VolumeCommon.cpp b/Source/Core/DiscIO/VolumeCommon.cpp index a6fa2dc41d..17fbbc4d11 100644 --- a/Source/Core/DiscIO/VolumeCommon.cpp +++ b/Source/Core/DiscIO/VolumeCommon.cpp @@ -24,14 +24,11 @@ static const unsigned int WII_BANNER_HEIGHT = 64; static const unsigned int WII_BANNER_SIZE = WII_BANNER_WIDTH * WII_BANNER_HEIGHT * 2; static const unsigned int WII_BANNER_OFFSET = 0xA0; -std::vector<u32> IVolume::GetBanner(int* width, int* height) const +std::vector<u32> IVolume::GetWiiBanner(int* width, int* height, u64 title_id) { *width = 0; *height = 0; - u64 title_id = 0; - GetTitleID(&title_id); - std::string file_name = StringFromFormat("%s/title/%08x/%08x/data/banner.bin", File::GetUserPath(D_WIIROOT_IDX).c_str(), (u32)(title_id >> 32), (u32)title_id); if (!File::Exists(file_name)) |