Erwan

- fix for issue 467 (simultaneous triggers + "trigger" keyword)
- MootPoint's patch for some string parsing
- some random int/float compilation warning fixes

projects/mtg/include/GameStateDeckViewer.h

@@ -71,7 +71,7 @@ enum DECK_VIEWER_MENU_ITEMS
 #define ROTATE_RIGHT 0;
 
 #define HIGH_SPEED 15.0
-#define MED_SPEED 5.0
+#define MED_SPEED 5.0f
 #define LOW_SPEED 1.5
 
 #define MAX_SAVED_FILTERS 8

projects/mtg/include/MTGAbility.h

@@ -252,13 +252,17 @@ class TriggerNextPhase:public TriggerAtPhase{
 class GenericTriggeredAbility:public TriggeredAbility, public NestedAbility{
  public:
   TriggeredAbility * t;
+  queue<Targetable *> targets;
   MTGAbility * destroyCondition;
   GenericTriggeredAbility(int id, MTGCardInstance * _source,  TriggeredAbility * _t, MTGAbility * a,MTGAbility * dc = NULL, Targetable * _target = NULL);
   virtual int trigger();
   virtual int triggerOnEvent(WEvent * e);
   virtual int resolve();
   virtual int testDestroy();
-  void setTriggerTargets(WEvent * e, MTGAbility * a);
+
+  Targetable * getTriggerTarget(WEvent * e, MTGAbility * a);
+  void setTriggerTargets(Targetable * ta, MTGAbility * a);
+
   void Update(float dt);
   virtual GenericTriggeredAbility* clone() const;
   const char * getMenuText();