Merge pull request #24 from WagicProject/master

getting master

projects/mtg/include/AllAbilities.h

@@ -2633,6 +2633,11 @@ public:
     {
         if(!nonstatic)
             return;
+        if(source->isToken && !source->isInPlay(game) && cda)
+        {
+            this->forceDestroy = 1;
+            return;
+        }
         if(!cda || (cda && (((MTGCardInstance *) target)->isSettingBase < 1)))
         {
             if(((MTGCardInstance *) target)->isSwitchedPT)

projects/mtg/include/GameStateDeckViewer.h

@@ -71,7 +71,7 @@ private:
     DeckViewerStages mStage;
     JMusic * bgMusic;
     
-    InteractiveButton *toggleDeckButton, *sellCardButton, *statsPrevButton, *filterButton, *toggleViewButton;
+    InteractiveButton *toggleDeckButton, *sellCardButton, *statsPrevButton, *filterButton, *toggleViewButton, *toggleUpButton, *toggleDownButton, *toggleLeftButton, *toggleRightButton;
 
     WGuiFilters * filterMenu;
     WSrcDeckViewer * source;

projects/mtg/include/InteractiveButton.h

@@ -29,6 +29,10 @@ const int kPrevStatsButtonId     = 10006;
 const int kCycleCardsButtonId    = 10007;
 const int kShowCardListButtonId  = 10008;
 const int kSwitchViewButton      = 10009;
+const int kToggleUpButton        = 10010;
+const int kToggleDownButton      = 10011;
+const int kToggleLeftButton      = 10012;
+const int kToggleRightButton     = 10013;
 
 class InteractiveButton: public SimpleButton
 {

projects/mtg/include/WResourceManagerImpl.h

@@ -10,7 +10,7 @@
 #include "JLogger.h"
 #include <sstream>
 
-#ifdef PSP
+#if defined (PSP) 
 #define HUGE_CACHE_LIMIT 28000000  // Size of the cache for PSP (in bytes) - old value is 20mb increased to 28mb
 #else
 #define HUGE_CACHE_LIMIT 60000000  // Size of the cache for Windows and Linux (in bytes) - old value is 20mb increased to 60mb