Erwan

- Fix for issue 284 (Damage not triggering when creature dies in combat phase)

projects/mtg/include/ActionStack.h

@@ -59,6 +59,7 @@ class Interruptible: public PlayGuiObject, public Targetable{
  Interruptible(bool hasFocus = false):PlayGuiObject(40,x,y,hasFocus){state=NOT_RESOLVED;display=0;source=NULL;};
   virtual const string getDisplayName() const {return "stack object";};
   void Render(MTGCardInstance * source, JQuad * targetQuad, string alt1, string alt2, string action, bool bigQuad = false);
+  virtual int receiveEvent(WEvent * event) {return 0;};
 #if defined (WIN32) || defined (LINUX)
   virtual void Dump();
 #endif
@@ -180,6 +181,7 @@ class ActionStack :public GuiLayer{
   int resolve();
   int has(Interruptible * action);
   int has(MTGAbility * ability);
+  int receiveEventPlus(WEvent * event);
 #if defined (WIN32) || defined (LINUX)
    void Dump();
 #endif

projects/mtg/include/Damage.h

@@ -55,6 +55,7 @@ class DamageStack : public GuiLayer, public Interruptible{
   GameObserver* game;
 
  public:
+  int receiveEvent(WEvent * event);
   int resolve();
   void Render();
   virtual ostream& toString(ostream& out) const;

projects/mtg/include/WEvent.h

@@ -52,6 +52,10 @@ struct WEventDamage : public WEvent {
   virtual Targetable * getTarget(int target);
 };
 
+struct WEventDamageStackResolved : public WEvent {
+  WEventDamageStackResolved();
+};
+
 struct WEventPhaseChange : public WEvent {
   Phase * from;
   Phase * to;