Added several ifdef PSP for different resolution image to merge the graphics folders.

projects/mtg/src/Credits.cpp

@@ -514,6 +514,13 @@ void Credits::Render()
         JQuadPtr wpQuad = WResourceManager::Instance()->RetrieveTempQuad("bgdeckeditor.jpg");
         r->RenderQuad(wpQuad.get(), 0, 0, 0, SCREEN_WIDTH_F / wpQuad->mWidth, SCREEN_HEIGHT_F / wpQuad->mHeight);
     }
+#else
+    JTexture * wpTex = WResourceManager::Instance()->RetrieveTexture("pspbgdeckeditor.jpg");
+    if (wpTex)
+    {
+        JQuadPtr wpQuad = WResourceManager::Instance()->RetrieveTempQuad("pspbgdeckeditor.jpg");
+        r->RenderQuad(wpQuad.get(), 0, 0, 0, SCREEN_WIDTH_F / wpQuad->mWidth, SCREEN_HEIGHT_F / wpQuad->mHeight);
+    }
 #endif
     WFont * f = WResourceManager::Instance()->GetWFont(Fonts::MAIN_FONT);
     WFont * f2 = WResourceManager::Instance()->GetWFont(Fonts::MENU_FONT);

projects/mtg/src/DeckMenu.cpp

@@ -250,9 +250,15 @@ void DeckMenu::Render()
     JQuadPtr avatarholder;
     JQuadPtr menupanel;
     JQuadPtr menuholder;
+#if defined (PSP)
+    avatarholder = WResourceManager::Instance()->RetrieveTempQuad("pspavatarholder.png");//new graphics avatarholder for PSP
+    menupanel = WResourceManager::Instance()->RetrieveTempQuad("pspmenupanel.jpg");//new graphics menupanel for PSP
+    menuholder = WResourceManager::Instance()->RetrieveTempQuad("pspmenuholder.png");//new graphics menuholder for PSP
+#else
     avatarholder = WResourceManager::Instance()->RetrieveTempQuad("avatarholder.png");//new graphics avatarholder
     menupanel = WResourceManager::Instance()->RetrieveTempQuad("menupanel.jpg");//new graphics menupanel
     menuholder = WResourceManager::Instance()->RetrieveTempQuad("menuholder.png");//new graphics menuholder
+#endif
     bool inDeckMenu = backgroundName.find("DeckMenuBackdrop") != string::npos;
     float modAvatarX = 0.f;
     float modAvatarY = 0.f;

projects/mtg/src/GameStateAwards.cpp

@@ -150,7 +150,12 @@ void GameStateAwards::Render()
     JRenderer * r = JRenderer::GetInstance();
     r->ClearScreen(ARGB(0,0,0,0));
 
+#if defined (PSP)
+    JQuadPtr background = WResourceManager::Instance()->RetrieveTempQuad("pspawardback.jpg", TEXTURE_SUB_5551);
+#else
     JQuadPtr background = WResourceManager::Instance()->RetrieveTempQuad("awardback.jpg", TEXTURE_SUB_5551);
+#endif
+
     if (background.get())
         r->RenderQuad(background.get(), 0, 0, 0, SCREEN_WIDTH_F / background->mWidth, SCREEN_HEIGHT_F / background->mHeight);
 

projects/mtg/src/GameStateDeckViewer.cpp

@@ -1431,6 +1431,15 @@ void GameStateDeckViewer::Render()
     }/*
     if (mView->deck() == myDeck && mStage != STAGE_MENU)
         renderDeckBackground();*/
+#else
+    JTexture * wpTex = WResourceManager::Instance()->RetrieveTexture("pspbgdeckeditor.jpg");
+    if (wpTex)
+    {
+        JQuadPtr wpQuad = WResourceManager::Instance()->RetrieveTempQuad("pspbgdeckeditor.jpg");
+        JRenderer::GetInstance()->RenderQuad(wpQuad.get(), 0, 0, 0, SCREEN_WIDTH_F / wpQuad->mWidth, SCREEN_HEIGHT_F / wpQuad->mHeight);
+    }/*
+    if (mView->deck() == myDeck && mStage != STAGE_MENU)
+        renderDeckBackground();*/
 #endif
     mView->Render();
 

projects/mtg/src/GameStateDuel.cpp

@@ -1041,12 +1041,20 @@ void GameStateDuel::Render()
     JRenderer * r = JRenderer::GetInstance();
     r->ClearScreen(ARGB(0,0,0,0));
 
+#if defined (PSP)
+    JTexture * wpTex = WResourceManager::Instance()->RetrieveTexture("pspbgdeckeditor.jpg");
+    if (wpTex)
+    {
+        JQuadPtr wpQuad = WResourceManager::Instance()->RetrieveTempQuad("pspbgdeckeditor.jpg");
+        JRenderer::GetInstance()->RenderQuad(wpQuad.get(), 0, 0, 0, SCREEN_WIDTH_F / wpQuad->mWidth, SCREEN_HEIGHT_F / wpQuad->mHeight);
+    }
+#else
     JTexture * wpTex = WResourceManager::Instance()->RetrieveTexture("bgdeckeditor.jpg");
     if (wpTex)
     {
         JQuadPtr wpQuad = WResourceManager::Instance()->RetrieveTempQuad("bgdeckeditor.jpg");
         JRenderer::GetInstance()->RenderQuad(wpQuad.get(), 0, 0, 0, SCREEN_WIDTH_F / wpQuad->mWidth, SCREEN_HEIGHT_F / wpQuad->mHeight);
-    }
+#endif
 
     //render the game until someone did win the game (otherwise it crashes sometimes under linux)
     if (game && !game->didWin())

projects/mtg/src/GameStateMenu.cpp

@@ -149,8 +149,13 @@ void GameStateMenu::Start()
     //Manual clean up of some cache Data. Ideally those should clean themselves up, so this is kind of a hack for now
     WResourceManager::Instance()->ClearUnlocked();
 
+#if defined (PSP)
+    bgTexture = WResourceManager::Instance()->RetrieveTexture("pspmenutitle.png", RETRIEVE_LOCK);
+    mBg = WResourceManager::Instance()->RetrieveQuad("pspmenutitle.png", 0, 0, 0, 0); // Create background quad for rendering.
+#else
     bgTexture = WResourceManager::Instance()->RetrieveTexture("menutitle.png", RETRIEVE_LOCK);
     mBg = WResourceManager::Instance()->RetrieveQuad("menutitle.png", 0, 0, 0, 0); // Create background quad for rendering.
+#endif
 
     if (mBg)
         mBg->SetHotSpot(mBg->mWidth/2, 0);

projects/mtg/src/GameStateOptions.cpp

@@ -236,6 +236,13 @@ void GameStateOptions::Render()
         JQuadPtr wpQuad = WResourceManager::Instance()->RetrieveTempQuad("bgdeckeditor.jpg");
         JRenderer::GetInstance()->RenderQuad(wpQuad.get(), 0, 0, 0, SCREEN_WIDTH_F / wpQuad->mWidth, SCREEN_HEIGHT_F / wpQuad->mHeight);
     }
+#else
+    JTexture * wpTex = WResourceManager::Instance()->RetrieveTexture("pspbgdeckeditor.jpg");
+    if (wpTex)
+    {
+        JQuadPtr wpQuad = WResourceManager::Instance()->RetrieveTempQuad("pspbgdeckeditor.jpg");
+        JRenderer::GetInstance()->RenderQuad(wpQuad.get(), 0, 0, 0, SCREEN_WIDTH_F / wpQuad->mWidth, SCREEN_HEIGHT_F / wpQuad->mHeight);
+    }
 #endif
     const char * const CreditsText[] = {
         "Wagic, The Homebrew?! by Wololo",

projects/mtg/src/GameStateShop.cpp

@@ -704,11 +704,20 @@ void GameStateShop::Render()
     if (mStage == STAGE_FADE_IN)
         return;
 
+#if defined (PSP)
+    JQuadPtr mBg = WResourceManager::Instance()->RetrieveTempQuad("pspshop.jpg", TEXTURE_SUB_5551);
+    if (mBg.get())
+        r->RenderQuad(mBg.get(), 0, 0, 0, SCREEN_WIDTH_F / mBg->mWidth, SCREEN_HEIGHT_F / mBg->mHeight);
+
+    JQuadPtr quad = WResourceManager::Instance()->RetrieveTempQuad("pspshop_light.jpg", TEXTURE_SUB_5551);
+#else
     JQuadPtr mBg = WResourceManager::Instance()->RetrieveTempQuad("shop.jpg", TEXTURE_SUB_5551);
     if (mBg.get())
         r->RenderQuad(mBg.get(), 0, 0, 0, SCREEN_WIDTH_F / mBg->mWidth, SCREEN_HEIGHT_F / mBg->mHeight);
 
     JQuadPtr quad = WResourceManager::Instance()->RetrieveTempQuad("shop_light.jpg", TEXTURE_SUB_5551);
+#endif
+
     if (quad.get())
     {
         r->EnableTextureFilter(false);

projects/mtg/src/GuiPhaseBar.cpp

@@ -95,7 +95,11 @@ bool GuiPhaseBar::Leaving(JButton)
 void GuiPhaseBar::Render()
 {
     JQuadPtr quad = WResourceManager::Instance()->GetQuad("phasebar");
+#if defined (PSP)
+    JQuadPtr phaseinfo = WResourceManager::Instance()->RetrieveTempQuad("pspfakebar.png"); //new fakebar graphics
+#else
     JQuadPtr phaseinfo = WResourceManager::Instance()->RetrieveTempQuad("fakebar.png"); //new fakebar graphics
+#endif
     //uncomment to draw a hideous line across hires screens.
     // JRenderer::GetInstance()->DrawLine(0, CENTER, SCREEN_WIDTH, CENTER, ARGB(255, 255, 255, 255));
 

projects/mtg/src/SimplePopup.cpp

@@ -38,14 +38,21 @@ void SimplePopup::Render()
 
     JRenderer *r = JRenderer::GetInstance();
     string detailedInformation = getDetailedInformation(mDeckInformation->getFilename());
+
 #if !defined (PSP)
-    
     JQuadPtr statsholder = WResourceManager::Instance()->RetrieveTempQuad("statsholder.png");//new graphics statsholder
     //const float textHeight = mTextFont->GetHeight() * mMaxLines;
     //r->FillRect(0,0,SCREEN_WIDTH_F,SCREEN_HEIGHT_F,ARGB(220,15,15,15));
     if(statsholder.get())
         r->RenderQuad(statsholder.get(),0,0,0,SCREEN_WIDTH_F/statsholder->mWidth,SCREEN_HEIGHT_F/statsholder->mHeight);
+#else
+    JQuadPtr statsholder = WResourceManager::Instance()->RetrieveTempQuad("pspstatsholder.png");//new graphics statsholder for PSP
+    //const float textHeight = mTextFont->GetHeight() * mMaxLines;
+    //r->FillRect(0,0,SCREEN_WIDTH_F,SCREEN_HEIGHT_F,ARGB(220,15,15,15));
+    if(statsholder.get())
+        r->RenderQuad(statsholder.get(),0,0,0,SCREEN_WIDTH_F/statsholder->mWidth,SCREEN_HEIGHT_F/statsholder->mHeight);
 #endif
+
     r->FillRoundRect(mX+modX+3, mY + 7, 190.f, 148.f, 0, ARGB( 240, 15, 15, 15 ) );
 
     // currently causes a crash on the PSP when drawing the corners.

projects/mtg/src/Tasks.cpp

@@ -385,7 +385,11 @@ void TaskList::Start()
 
     if (!mBgTex)
     {
+#if defined (PSP)
+        mBgTex = WResourceManager::Instance()->RetrieveTexture("psptaskboard.png", RETRIEVE_LOCK);
+#else
         mBgTex = WResourceManager::Instance()->RetrieveTexture("taskboard.png", RETRIEVE_LOCK);
+#endif
         float unitH = static_cast<float> (mBgTex->mHeight / 4);
         float unitW = static_cast<float> (mBgTex->mWidth / 4);
         if (unitH == 0 || unitW == 0) return;

projects/mtg/src/TextScroller.cpp

@@ -171,9 +171,21 @@ void VerticalTextScroller::Render()
     if(!mText.empty() && mText.length() > 1)
         if (textscrollershadow.get())
             JRenderer::GetInstance()->RenderQuad(textscrollershadow.get(), 0, 0, 0 ,SCREEN_WIDTH_F / textscrollershadow->mWidth, SCREEN_HEIGHT_F / textscrollershadow->mHeight);
-#endif
+
     mFont->DrawString(mText.c_str(), mX, mY);
-#if !defined (PSP)
+
+    if(!mText.empty() && mText.length() > 1)
+        if (textscroller.get())
+            JRenderer::GetInstance()->RenderQuad(textscroller.get(), 0, 0, 0 ,SCREEN_WIDTH_F / textscroller->mWidth, SCREEN_HEIGHT_F / textscroller->mHeight);
+#else
+    textscroller = WResourceManager::Instance()->RetrieveTempQuad("psptextscroller.png");//new graphics textscroller
+    textscrollershadow = WResourceManager::Instance()->RetrieveTempQuad("psptextscrollershadow.png");//new graphics textscroller shadow
+    if(!mText.empty() && mText.length() > 1)
+        if (textscrollershadow.get())
+            JRenderer::GetInstance()->RenderQuad(textscrollershadow.get(), 0, 0, 0 ,SCREEN_WIDTH_F / textscrollershadow->mWidth, SCREEN_HEIGHT_F / textscrollershadow->mHeight);
+
+    mFont->DrawString(mText.c_str(), mX, mY);
+
     if(!mText.empty() && mText.length() > 1)
         if (textscroller.get())
             JRenderer::GetInstance()->RenderQuad(textscroller.get(), 0, 0, 0 ,SCREEN_WIDTH_F / textscroller->mWidth, SCREEN_HEIGHT_F / textscroller->mHeight);

projects/mtg/src/WGui.cpp

@@ -1316,6 +1316,22 @@ void WGuiAward::Underlay()
     char buf[1024];
     JQuadPtr trophy;
 
+#if defined (PSP)
+    string n = id ? Options::getName(id) : textId;
+    if (n.size())
+    {
+        sprintf(buf, "psptrophy_%s.png", n.c_str()); //Trophy specific to the award
+        trophy = WResourceManager::Instance()->RetrieveTempQuad(buf); //Themed version...
+    }
+
+    if (!trophy && id >= Options::SET_UNLOCKS)
+    {
+        trophy = WResourceManager::Instance()->RetrieveTempQuad("psptrophy_set.png"); //TODO FIXME: Should look in set dir too.
+    }
+
+    if (!trophy.get()) //Fallback to basic trophy image.
+        trophy = WResourceManager::Instance()->RetrieveTempQuad("psptrophy.png");
+#else
     string n = id ? Options::getName(id) : textId;
     if (n.size())
     {
@@ -1329,7 +1345,8 @@ void WGuiAward::Underlay()
     }
 
     if (!trophy.get()) //Fallback to basic trophy image.
-    trophy = WResourceManager::Instance()->RetrieveTempQuad("trophy.png");
+        trophy = WResourceManager::Instance()->RetrieveTempQuad("trophy.png");	
+#endif
 
     if (trophy.get())
     {