Erwan

-Issue 26: added an option for Mana Display. This needs a bit testing, but it should also lower the priority of "manapool slowness" as this mode probably fixes performance issue as well.
-I can't seem to be able to "save" some options (hand position, mana display) ion the windows version, does this change break something ?

projects/mtg/include/GameOptions.h

@@ -32,6 +32,7 @@ public:
     OSD,
     CLOSEDHAND,
     HANDDIRECTION,
+    MANADISPLAY,
     REVERSETRIGGERS,
     DISABLECARDS,
     INTERRUPT_SECONDS,

projects/mtg/include/GuiMana.h

@@ -9,9 +9,6 @@
 
 class ManaIcon : public Pos
 {
-  static const float DESTX;
-  static const float DESTY;
-
   hgeParticleSystem* particleSys;
   JQuad* icon;
 
@@ -20,6 +17,7 @@ class ManaIcon : public Pos
   float yP1, yP2, yP3;
   float tP1;
   float f;
+  float destx,desty;
  public:
   enum { ALIVE, WITHERING, DROPPING, DEAD } mode;
   int color;
@@ -27,7 +25,7 @@ class ManaIcon : public Pos
   void Update(float dt, float shift);
   void Wither();
   void Drop();
-  ManaIcon(int color, float x, float y);
+  ManaIcon(int color, float x, float y,float destx, float desty);
   ~ManaIcon();
 };
 
@@ -35,8 +33,11 @@ class GuiMana : public GuiLayer
 {
  protected:
   vector<ManaIcon*> manas;
+  float x, y;
+  Player * owner;
+  void RenderStatic();
  public:
-  GuiMana();
+  GuiMana(float x, float y, Player *p);
   ~GuiMana();
   virtual void Render();
   virtual void Update(float dt);

projects/mtg/include/OptionItem.h

@@ -249,4 +249,17 @@ private:
   static EnumDefinition * definition;
 };
 
+class OptionManaDisplay : public OptionEnum {
+ public:
+   friend class GameSettings;
+  enum { DYNAMIC = 0, STATIC = 1, BOTH = 2};
+  OptionManaDisplay(int id, string displayValue);
+  
+  static EnumDefinition * getDefinition();
+  EnumDefinition * ourDefined() const { return getDefinition();};
+
+private:
+  static EnumDefinition * definition;
+};
+
 #endif