Erwan

- fix issue 215
- added test for purple screen (this is the small white square on top of the loading screen)

projects/mtg/include/GameStateDeckViewer.h

@@ -104,9 +104,7 @@ private:
   JMusic * bgMusic;
   JQuad * backQuad;
   SimpleMenu * welcome_menu;
-  JLBFont * mFont;
   bool showing_user_deck;
-  JLBFont * menuFont;
   SimpleMenu * menu;
   SimpleMenu * sellMenu;
   PriceList* pricelist;

projects/mtg/include/GameStateDuel.h

@@ -31,7 +31,6 @@ class GameStateDuel: public GameState, public JGuiListener
   SimpleMenu * opponentMenu;
   SimpleMenu * menu;
   bool premadeDeck;
-  JLBFont* mFont, *opponentMenuFont;
 
   void loadPlayer(int playerId, int decknb = 0, int isAI = 0);
   void loadPlayerMomir(int playerId, int isAI);

projects/mtg/include/GameStateShop.h

@@ -19,8 +19,6 @@ class GameStateShop: public GameState, public JGuiListener
  private:
 
   ShopItems * shop;
-  JLBFont * menuFont;
-  JLBFont * itemFont;
   JTexture * altThumb[8];
   JQuad * mBack;
   JQuad * mBg;

projects/mtg/include/SimpleMenu.h

@@ -19,7 +19,7 @@ class SimpleMenu:public JGuiController{
 
  private:
   int mHeight, mWidth, mX, mY;
-  JLBFont* mFont;
+  int fontId;
   std::string title;
   int displaytitle;
   int maxItems,startId;
@@ -40,7 +40,7 @@ class SimpleMenu:public JGuiController{
 
  public:
   bool autoTranslate;
-  SimpleMenu(int id, JGuiListener* listener, JLBFont* font, int x, int y, const char * _title = "", int _maxItems = 7);
+  SimpleMenu(int id, JGuiListener* listener, int fontId, int x, int y, const char * _title = "", int _maxItems = 7);
   void Render();
   void Update(float dt);
   void Add(int id, const char * Text,string desc = "", bool forceFocus = false);

projects/mtg/include/SimpleMenuItem.h

@@ -18,14 +18,14 @@ class SimpleMenuItem: public JGuiObject
  private:
   bool mHasFocus;
   SimpleMenu* parent;
-  JLBFont *mFont;
+  int fontId;
   string mText;
   float mScale;
   float mTargetScale;
 
  public:
   string desc;
-  SimpleMenuItem(SimpleMenu* _parent, int id, JLBFont *font, string text, int x, int y, bool hasFocus = false, bool autoTranslate = false);
+  SimpleMenuItem(SimpleMenu* _parent, int id, int fontId, string text, int x, int y, bool hasFocus = false, bool autoTranslate = false);
 
   int mX;
   int mY;

projects/mtg/include/TextScroller.h

@@ -11,7 +11,7 @@ class TextScroller: public JGuiObject{
 protected:
   string mText;
   string tempText;
-  JLBFont * mFont;
+  int fontId;
   float mWidth;
   float mSpeed;
   float mX;
@@ -25,7 +25,7 @@ public:
   void Add(string text);
   void Reset();
   void setRandom(int mode = 1);
-  TextScroller(JLBFont * font, float x, float y, float width, float speed = 30);
+  TextScroller(int fontId, float x, float y, float width, float speed = 30);
   void Render();
   void Update(float dt);
   virtual ostream& toString(ostream& out) const;

projects/mtg/include/WResourceManager.h

@@ -175,8 +175,9 @@ public:
  	JTexture* GetTexture(const string &textureName);
 	JTexture* GetTexture(int id);
 
+  int reloadJLBFonts();
   //Wrapped from JResourceManger. TODO: Privatize
-  int LoadJLBFont(const string &fontName, int height);
+  JLBFont * LoadJLBFont(const string &fontName, int height);
  
   //Wrapped from JSoundSystem. TODO: Privatize.
   JMusic * ssLoadMusic(const char *fileName);