Merge pull request #28 from WagicProject/master

getting master

projects/mtg/bin/Res/rules/awards.dat

@@ -10,6 +10,7 @@ unlock_condition=type(land|myBattlefield)~equalto~8
 [award]
 name=Hermit Druid Mode
 id=prx_timreh
+unlock_img=hermit_unlocked.png
 unlock_text=Hermit Druid Basic Unlocked
 trophyroom_text=Won with less than 10 lands.
 unlock_condition=type(land|myBattlefield)~lessthan~10
@@ -18,6 +19,7 @@ unlock_condition=type(land|myBattlefield)~lessthan~10
 [award]
 name=Stone Hewer Mode
 id=prx_rewehenots
+unlock_img=stonehewer_unlocked.png
 unlock_text=Stone Hewer Basic Unlocked
 teaser=Love Equipment and want a real challenge? Unlock Stone Hewer Basic:)
 trophyroom_text=Won with more than 10 equipments.
@@ -27,6 +29,7 @@ unlock_condition=type(equipment|Battlefield)~morethan~10
 [award]
 name=Blitzkrieg Mode
 id=prx_geirkztilb
+unlock_img=blitz_unlocked.png
 unlock_text=Blitzkrieg Mode Unlocked
 teaser=Like to play fast? Unlock Blitzkrieg Mode :)
 trophyroom_text=Won with more than 18 lands.

projects/mtg/include/WResourceManagerImpl.h

@@ -11,7 +11,7 @@
 #include <sstream>
 
 #if defined (PSP) 
-#define HUGE_CACHE_LIMIT 20000000  // Size of the cache for PSP (in bytes) - old value is 20mb - reverted
+#define HUGE_CACHE_LIMIT 25000000  // Size of the cache for PSP (in bytes) - old value is 20mb - reverted
 #else
 #define HUGE_CACHE_LIMIT 60000000  // Size of the cache for Windows and Linux (in bytes) - old value is 20mb increased to 60mb
 #endif

projects/mtg/src/DeckMenu.cpp

@@ -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

@@ -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);
 }