Mahtan/wagic
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #776 from kevlahnota/master

Browse Source 
psp fix 3
This commit is contained in:
Anthony Calosa
2016-07-21 02:37:47 -05:00
committed by GitHub
parent a35ccbbe5b 3bc7ed6f8c
commit b371bf6efa
5 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
projects/mtg/bin/Res/graphics/pspmagic.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 13 KiB

BIN
projects/mtg/bin/Res/graphics/pspmenubgdeckeditor.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 20 KiB

2
projects/mtg/include/WResourceManagerImpl.h
View File

@@ -11,7 +11,7 @@
#include <sstream> #include <sstream>
#if defined (PSP) #if defined (PSP)
#define HUGE_CACHE_LIMIT 20000000 // Size of the cache for PSP (in bytes) - old value is 20mb - reverted #define HUGE_CACHE_LIMIT 25000000 // Size of the cache for PSP (in bytes) - old value is 20mb - reverted
#else #else
#define HUGE_CACHE_LIMIT 60000000 // Size of the cache for Windows and Linux (in bytes) - old value is 20mb increased to 60mb #define HUGE_CACHE_LIMIT 60000000 // Size of the cache for Windows and Linux (in bytes) - old value is 20mb increased to 60mb
#endif #endif

5
projects/mtg/src/DeckMenu.cpp
View File

@@ -151,7 +151,10 @@ void DeckMenu::RenderBackground()
bgFilename << backgroundName << ".png"; bgFilename << backgroundName << ".png";
#if defined (PSP) #if defined (PSP)
bgFilename << "psppspdeckmenu.png"; if(backgroundName == "menubgdeckeditor")
bgFilename << "pspmenubgdeckeditor.jpg";
else
bgFilename << "pspdeckmenu.png";
#endif #endif
static bool loadBackground = true; static bool loadBackground = true;

3
projects/mtg/src/WResourceManager.cpp
View File

@@ -842,12 +842,13 @@ void ResourceManagerImpl::InitFonts(const std::string& inLang)
LoadWFont("pspsimon", 11, Fonts::MAIN_FONT + idOffset); LoadWFont("pspsimon", 11, Fonts::MAIN_FONT + idOffset);
GetWFont(Fonts::MAIN_FONT)->SetTracking(-1); GetWFont(Fonts::MAIN_FONT)->SetTracking(-1);
LoadWFont("pspf3", 16, Fonts::MENU_FONT + idOffset); LoadWFont("pspf3", 16, Fonts::MENU_FONT + idOffset);
LoadWFont("pspmagic", 16, Fonts::MAGIC_FONT + idOffset);
#else #else
LoadWFont("simon", 11, Fonts::MAIN_FONT + idOffset); LoadWFont("simon", 11, Fonts::MAIN_FONT + idOffset);
GetWFont(Fonts::MAIN_FONT)->SetTracking(-1); GetWFont(Fonts::MAIN_FONT)->SetTracking(-1);
LoadWFont("f3", 16, Fonts::MENU_FONT + idOffset); LoadWFont("f3", 16, Fonts::MENU_FONT + idOffset);
#endif
LoadWFont("magic", 16, Fonts::MAGIC_FONT + idOffset); LoadWFont("magic", 16, Fonts::MAGIC_FONT + idOffset);
#endif
LoadWFont("smallface", 7, Fonts::SMALLFACE_FONT + idOffset); LoadWFont("smallface", 7, Fonts::SMALLFACE_FONT + idOffset);
} }