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

Merge pull request #774 from kevlahnota/master

Browse Source 
psp fix 2
This commit is contained in:
Anthony Calosa
2016-07-20 17:36:02 -05:00
committed by GitHub
parent 3d7362aa9d c89961ebf0
commit 0fd0c5ecc1
5 changed files with 21 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 21 KiB

4
projects/mtg/src/GameApp.cpp
View File

@@ -231,8 +231,12 @@ void GameApp::Create()
//WResourceManager::Instance()->RetrieveTexture("wood.png", RETRIEVE_MANAGE); //WResourceManager::Instance()->RetrieveTexture("wood.png", RETRIEVE_MANAGE);
//WResourceManager::Instance()->RetrieveTexture("gold.png", RETRIEVE_MANAGE); //WResourceManager::Instance()->RetrieveTexture("gold.png", RETRIEVE_MANAGE);
//WResourceManager::Instance()->RetrieveTexture("goldglow.png", RETRIEVE_MANAGE); //WResourceManager::Instance()->RetrieveTexture("goldglow.png", RETRIEVE_MANAGE);
#if !defined (PSP)
WResourceManager::Instance()->RetrieveTexture("backdrop.jpg", RETRIEVE_MANAGE); WResourceManager::Instance()->RetrieveTexture("backdrop.jpg", RETRIEVE_MANAGE);
WResourceManager::Instance()->RetrieveTexture("backdropframe.png", RETRIEVE_MANAGE); WResourceManager::Instance()->RetrieveTexture("backdropframe.png", RETRIEVE_MANAGE);
#else
WResourceManager::Instance()->RetrieveTexture("pspbackdrop.jpg", RETRIEVE_MANAGE);
#endif
WResourceManager::Instance()->RetrieveTexture("handback.png", RETRIEVE_MANAGE); WResourceManager::Instance()->RetrieveTexture("handback.png", RETRIEVE_MANAGE);
WResourceManager::Instance()->RetrieveTexture("shadows.png", RETRIEVE_MANAGE); WResourceManager::Instance()->RetrieveTexture("shadows.png", RETRIEVE_MANAGE);

10
projects/mtg/src/GridDeckView.cpp
View File

@@ -125,11 +125,17 @@ void GridDeckView::Render()
{ {
if (WResourceManager::Instance()->IsThreaded()) if (WResourceManager::Instance()->IsThreaded())
{ {
//WResourceManager::Instance()->RetrieveCard(mCards[i].card, RETRIEVE_THUMB); #if !defined (PSP)
WResourceManager::Instance()->RetrieveCard(mCards[i].card, RETRIEVE_NORMAL); WResourceManager::Instance()->RetrieveCard(mCards[i].card, RETRIEVE_NORMAL);
#else
WResourceManager::Instance()->RetrieveCard(mCards[i].card, RETRIEVE_THUMB);
#endif
} }
//renderCard(i, 255, true); #if !defined (PSP)
renderCard(i, 255, false);//for psp, use lowres images if you can. renderCard(i, 255, false);//for psp, use lowres images if you can.
#else
renderCard(i, 255, true);
#endif
} }
else else
{ {

7
projects/mtg/src/GuiBackground.cpp
View File

@@ -7,6 +7,7 @@
const std::string kBackdropFile = "backdrop.jpg"; const std::string kBackdropFile = "backdrop.jpg";
const std::string kBackdropFrameFile = "backdropframe.png"; const std::string kBackdropFrameFile = "backdropframe.png";
const std::string kPspBackdropFile = "pspbackdrop.jpg";
GuiBackground::GuiBackground(GameObserver* observer) GuiBackground::GuiBackground(GameObserver* observer)
: GuiLayer(observer) : GuiLayer(observer)
@@ -28,14 +29,20 @@ void GuiBackground::Render()
} }
if (!quad.get()) if (!quad.get())
{ {
#if !defined (PSP)
quad = WResourceManager::Instance()->RetrieveTempQuad(kBackdropFile); quad = WResourceManager::Instance()->RetrieveTempQuad(kBackdropFile);
#else
quad = WResourceManager::Instance()->RetrieveTempQuad(kPspBackdropFile);
#endif
} }
if (quad.get()) if (quad.get())
{ {
renderer->RenderQuad(quad.get(), 0, 0, 0, SCREEN_WIDTH_F / quad->mWidth, SCREEN_HEIGHT_F / quad->mHeight); renderer->RenderQuad(quad.get(), 0, 0, 0, SCREEN_WIDTH_F / quad->mWidth, SCREEN_HEIGHT_F / quad->mHeight);
} }
#if !defined (PSP)
if (quadframe.get()) if (quadframe.get())
{ {
renderer->RenderQuad(quadframe.get(), 0, 0, 0, SCREEN_WIDTH_F / quadframe->mWidth, SCREEN_HEIGHT_F / quadframe->mHeight); renderer->RenderQuad(quadframe.get(), 0, 0, 0, SCREEN_WIDTH_F / quadframe->mWidth, SCREEN_HEIGHT_F / quadframe->mHeight);
} }
#endif
} }

2
projects/mtg/src/GuiPhaseBar.cpp
View File

@@ -149,6 +149,7 @@ void GuiPhaseBar::Render()
string phaseNameToTranslate = observer->phaseRing->phaseName(displayedPhaseId%kPhases + 1); string phaseNameToTranslate = observer->phaseRing->phaseName(displayedPhaseId%kPhases + 1);
phaseNameToTranslate = _(phaseNameToTranslate); phaseNameToTranslate = _(phaseNameToTranslate);
sprintf(buf, _("(%s%s) %s").c_str(), currentP.c_str(), interrupt.c_str(),phaseNameToTranslate.c_str()); sprintf(buf, _("(%s%s) %s").c_str(), currentP.c_str(), interrupt.c_str(),phaseNameToTranslate.c_str());
#if !defined (PSP)
if(phaseinfo.get()) if(phaseinfo.get())
{ {
@@ -157,6 +158,7 @@ void GuiPhaseBar::Render()
//phaseinfo->mHeight = font->GetHeight()+5.f; //phaseinfo->mHeight = font->GetHeight()+5.f;
JRenderer::GetInstance()->RenderQuad(phaseinfo.get(),SCREEN_WIDTH_F,0,0,2.2f, SCREEN_HEIGHT_F / phaseinfo->mHeight); JRenderer::GetInstance()->RenderQuad(phaseinfo.get(),SCREEN_WIDTH_F,0,0,2.2f, SCREEN_HEIGHT_F / phaseinfo->mHeight);
} }
#endif
font->DrawString(buf, SCREEN_WIDTH - 5, 2, JGETEXT_RIGHT); font->DrawString(buf, SCREEN_WIDTH - 5, 2, JGETEXT_RIGHT);
} }