Erwan

- Cache size is now an option

projects/mtg/include/GameApp.h

@@ -84,6 +84,7 @@ class GameApp:	public JApp
   static JResourceManager * CommonRes;
   static hgeParticleSystem * Particles[6];
   static int HasMusic;
+  static string systemError;
   static JMusic* music;
 
 };

projects/mtg/include/GameOptions.h

@@ -11,6 +11,7 @@ using std::string;
 #define OPTIONS_DIFFICULTY_MODE_UNLOCKED "prx_handler" //huhu
 #define OPTIONS_MOMIR_MODE_UNLOCKED "prx_rimom" //haha
 #define OPTIONS_DIFFICULTY "difficulty"
+#define OPTIONS_CACHESIZE "cacheSize"
 
 // WALDORF - added
 #define OPTIONS_INTERRUPT_SECONDS "interruptSeconds"                         

projects/mtg/include/GameStateMenu.h

@@ -6,6 +6,7 @@
 #include "../include/GameState.h"
 #include "../include/SimpleMenu.h"
 
+
 class GameStateMenu: public GameState, public JGuiListener
 {
  private:

projects/mtg/include/MTGGuiPlay.h

@@ -26,7 +26,6 @@ class MTGGuiPlay: public PlayGuiObjectController {
   float mGlitterX, mGlitterY;
   JTexture * mPhaseBarTexture;
   JQuad * mIcons[7];
-  JTexture * mIconsTexture;
   JTexture * mBgTex;
   JQuad * mBg;
 

projects/mtg/include/ManaCost.h

@@ -16,6 +16,7 @@ class ManaCost{
   int cost[Constants::MTG_NB_COLORS+1];
   ManaCostHybrid * hybrids[10];
   unsigned int nbhybrids;
+  int extraCostsIsCopy;
   
  public:
   ExtraCosts * extraCosts;

projects/mtg/include/TexturesCache.h

@@ -2,7 +2,7 @@
 #define _TEXTURES_CACHE_H
 
 #define MAX_CACHE_OBJECTS 100
-#define CACHE_SIZE_PIXELS 6000000
+#define CACHE_SIZE_PIXELS 2000000
 
 #define CACHE_CARD 1
 #define CACHE_THUMB 2
@@ -43,6 +43,7 @@ class TexturesCache{
   int nb_textures;
   int delete_previous;
   int totalsize;
+  int maxSize;
   CardTexture * cache[MAX_CACHE_OBJECTS];
  public:
   int isInCache(MTGCard * card, int type=CACHE_CARD);