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

Merge pull request #28 from WagicProject/master

Browse Source 
getting master
This commit is contained in:
zethfoxster
2016-07-21 22:29:58 -04:00
committed by GitHub
parent 6aafe9dee0 680c9d64cb
commit 155a7a6582
10 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
projects/mtg/src/DeckMenu.cpp
+4 -1
View File
@@ -151,7 +151,10 @@ void DeckMenu::RenderBackground()
bgFilename << backgroundName << ".png";
#if defined (PSP)
bgFilename << "psppspdeckmenu.png";
if(backgroundName == "menubgdeckeditor")
bgFilename << "pspmenubgdeckeditor.jpg";
else
bgFilename << "pspdeckmenu.png";
#endif
static bool loadBackground = true;
projects/mtg/src/WResourceManager.cpp
+2 -1
View File
@@ -842,12 +842,13 @@ void ResourceManagerImpl::InitFonts(const std::string& inLang)
LoadWFont("pspsimon", 11, Fonts::MAIN_FONT + idOffset);
GetWFont(Fonts::MAIN_FONT)->SetTracking(-1);
LoadWFont("pspf3", 16, Fonts::MENU_FONT + idOffset);
LoadWFont("pspmagic", 16, Fonts::MAGIC_FONT + idOffset);
#else
LoadWFont("simon", 11, Fonts::MAIN_FONT + idOffset);
GetWFont(Fonts::MAIN_FONT)->SetTracking(-1);
LoadWFont("f3", 16, Fonts::MENU_FONT + idOffset);
#endif
LoadWFont("magic", 16, Fonts::MAGIC_FONT + idOffset);
#endif
LoadWFont("smallface", 7, Fonts::SMALLFACE_FONT + idOffset);
}