From 8c4fabb89aafce9c142096f1d151caa3f5c9ccba Mon Sep 17 00:00:00 2001
From: Anthony Calosa <anthonycalosa@gmail.com>
Date: Sun, 18 Oct 2015 15:55:10 +0800
Subject: [PATCH] menuicons forced for PSP build

---
 projects/mtg/src/GameApp.cpp       | 2 ++
 projects/mtg/src/GameStateMenu.cpp | 5 +++++
 projects/mtg/src/TargetChooser.cpp | 2 +-
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/projects/mtg/src/GameApp.cpp b/projects/mtg/src/GameApp.cpp
index c207594c2..bdc8fbe05 100644
--- a/projects/mtg/src/GameApp.cpp
+++ b/projects/mtg/src/GameApp.cpp
@@ -174,7 +174,9 @@ void GameApp::Create()
     LOG("Loading Textures");
     LOG("--Loading menuicons.png");
     WResourceManager::Instance()->RetrieveTexture("menuicons.png", RETRIEVE_MANAGE);
+#if !defined (PSP)
     WResourceManager::Instance()->RetrieveTexture("miconslarge.png", RETRIEVE_MANAGE);
+#endif
     LOG("---Gettings menuicons.png quads");
    
     //Load all icons from gModRules and save in manaIcons -> todo. Change the icons positions on menuicons.png to avoid use item->mColorId
diff --git a/projects/mtg/src/GameStateMenu.cpp b/projects/mtg/src/GameStateMenu.cpp
index 9845c291e..0fa693f16 100644
--- a/projects/mtg/src/GameStateMenu.cpp
+++ b/projects/mtg/src/GameStateMenu.cpp
@@ -85,8 +85,13 @@ void GameStateMenu::Create()
     {
         for (int j = 0; j < 2; j++)
         {
+#if defined (PSP)
+            sprintf(buf, "menuicons%d%d", i, j);
+            mIcons[n] = WResourceManager::Instance()->RetrieveQuad("menuicons.png", 2 + i * 36.0f, 2.0f + j * 36.0f, 32.0f, 32.0f, buf);
+#else
             sprintf(buf, "miconslarge%d%d", i, j);
             mIcons[n] = WResourceManager::Instance()->RetrieveQuad("miconslarge.png", 4 + i * 72.0f, 4.0f + j * 72.0f, 72.0f, 72.0f, buf);
+#endif
             if (mIcons[n])
             {
                 mIcons[n]->mHeight = 36.f;
diff --git a/projects/mtg/src/TargetChooser.cpp b/projects/mtg/src/TargetChooser.cpp
index 10499dc3b..9d58f058d 100644
--- a/projects/mtg/src/TargetChooser.cpp
+++ b/projects/mtg/src/TargetChooser.cpp
@@ -859,7 +859,7 @@ bool TargetChooser::canTarget(Targetable * target, bool withoutProtections)
             if (card->protectedAgainst(targetter)) return targetter->bypassTC;
             if (card->CantBeTargetby(targetter)) return targetter->bypassTC;
             if ((targetter->controller() != card->controller()) && card->has(Constants::OPPONENTSHROUD)) return targetter->bypassTC;
-	        if (card->has(Constants::PROTECTIONFROMCOLOREDSPELLS))
+            if (card->has(Constants::PROTECTIONFROMCOLOREDSPELLS))
             {//a spell that has no target=criteria means it's not targetted unless its a workaround card...
                 if((targetter->spellTargetType.size()) && (targetter->hasColor(1)||targetter->hasColor(2)||targetter->hasColor(3)||targetter->hasColor(4)||targetter->hasColor(5)))
                     return targetter->bypassTC;