diff options
| author | sl1nk3.s <sl1nk3.s@gmail.com> | 2009-07-28 23:38:49 +0000 |
|---|---|---|
| committer | sl1nk3.s <sl1nk3.s@gmail.com> | 2009-07-28 23:38:49 +0000 |
| commit | caf152fdd09fe7eda2b797f41b3a18db87a6071d (patch) | |
| tree | 192efc6b13567a88e24595503206fd14e2f68136 /Source/Core/DiscIO/Src/BannerLoader.cpp | |
| parent | c86d2e5129fc0ecffa647db457aa99d13230ea29 (diff) | |
Fix screenshot offset as well as screenshot aspect ratio, also use PNG instead of BMP thanks to issue 1186.
Fix for opening.bnr containing bad chars where the loop would stop when encountering one (fixes Rogue Leader description, which was using 0x0d and 0x0a)
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@3899 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source/Core/DiscIO/Src/BannerLoader.cpp')
| -rw-r--r-- | Source/Core/DiscIO/Src/BannerLoader.cpp | 21 |
1 files changed, 5 insertions, 16 deletions
diff --git a/Source/Core/DiscIO/Src/BannerLoader.cpp b/Source/Core/DiscIO/Src/BannerLoader.cpp index 3288e1e848..b18fc61dc8 100644 --- a/Source/Core/DiscIO/Src/BannerLoader.cpp +++ b/Source/Core/DiscIO/Src/BannerLoader.cpp @@ -30,14 +30,14 @@ namespace DiscIO { -bool IBannerLoader::CopyToStringAndCheck(std::string& _rDestination, const char* _src) +void IBannerLoader::CopyToStringAndCheck(std::string& _rDestination, const char* _src) { static bool bValidChars[256]; static bool bInitialized = false; if (!bInitialized) { - for (int i = 0; i < 256; i++) + for (int i = 0; i < 0x20; i++) { bValidChars[i] = false; } @@ -55,7 +55,6 @@ bool IBannerLoader::CopyToStringAndCheck(std::string& _rDestination, const char* bInitialized = true; } - bool bResult = true; char destBuffer[2048] = {0}; char* dest = destBuffer; const char* src = _src; @@ -69,8 +68,8 @@ bool IBannerLoader::CopyToStringAndCheck(std::string& _rDestination, const char* if (bValidChars[c] == false) { - bResult = false; - break; + src++; + continue; } *dest = c; @@ -79,19 +78,9 @@ bool IBannerLoader::CopyToStringAndCheck(std::string& _rDestination, const char* } // finalize the string - if (bResult) - { - *dest = 0x00; - } - else - { - dest[0] = ' '; - dest[1] = 0x00; - } + *dest = 0x00; _rDestination = destBuffer; - - return(bResult); } bool IBannerLoader::CopyBeUnicodeToString( std::string& _rDestination, const u16* _src, int length ) |