Erwan

- fix for issue 467 (simultaneous triggers + "trigger" keyword) - MootPoint's patch for some string parsing - some random int/float compilation warning fixes
2010-10-01 16:33:07 +00:00
parent f4e87b7daf
commit 508040b3a7
9 changed files with 56 additions and 48 deletions
@@ -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();