J :

* A number of adjustments about fonts.

projects/mtg/include/GameStateDuel.h

@@ -6,17 +6,6 @@
 #include "_includeAll.h"
 #include "../include/SimpleMenu.h"
 
-enum
-  {
-    DUEL_START,
-    DUEL_END,
-    DUEL_CHOOSE_DECK1,
-    DUEL_CHOOSE_DECK2,
-    ERROR_NO_DECK,
-    DUEL_PLAY,
-    DUEL_MENU
-  };
-
 #define CHOOSE_OPPONENT 7
 
 #ifdef TESTSUITE

projects/mtg/include/SimpleMenu.h

@@ -15,7 +15,7 @@ class SimpleMenu:public JGuiController{
   static const unsigned SIDE_SIZE;
   static const unsigned VMARGIN;
   static const unsigned HMARGIN;
-  static const unsigned LINE_HEIGHT;
+  static const signed LINE_HEIGHT;
   static const char* spadeLPath;
   static const char* spadeRPath;
   static const char* jewelPath;
@@ -28,12 +28,17 @@ class SimpleMenu:public JGuiController{
   std::string title;
   int displaytitle;
   int maxItems,startId;
-  hgeParticleSystem* stars;
   float selectionT, selectionY;
   float timeOpen;
+  static unsigned int refCount;
 
   static JQuad *spadeR, *spadeL, *jewel, *side;
   static JLBFont* titleFont;
+  static hgeParticleSystem* stars;
+  // This works only because of no multithreading
+  static PIXEL_TYPE jewelGraphics[9];
+
+  inline void MogrifyJewel();
   void drawHorzPole(int x, int y, int width);
   void drawVertPole(int x, int y, int height);