Erwan

- Events are now sent to GameObserver rather than ActionLayer

projects/mtg/include/DuelLayers.h

@@ -12,7 +12,7 @@ class DamageResolverLayer;
 
 class DuelLayers: public GuiLayers{
 
- public:
+public : 
   ActionLayer * actionLayer();
   MTGGuiHand * handLayer();
   MTGGuiPlay * playLayer();

projects/mtg/include/GameObserver.h

@@ -85,7 +85,7 @@ class GameObserver{
   void Render();
   void ButtonPressed(int, PlayGuiObject*);
 
-
+  int receiveEvent(WEvent * event);
 };
 
 #endif

projects/mtg/include/GuiLayers.h

@@ -9,11 +9,12 @@
 #define DIR_RIGHT 4
 
 #include <JGui.h>
-
+#include "../include/WEvent.h"
 
 class GameObserver;
 class Player;
 
+
 class GuiLayer{
  protected:
   GameObserver * game;
@@ -43,6 +44,8 @@ class GuiLayer{
     if (mCount) return 0;
     return 1;
   };
+
+  virtual int receiveEvent(WEvent * e){return 0;};
 };
 
 class GuiLayers{
@@ -57,6 +60,7 @@ class GuiLayers{
   void Remove();
   int unstoppableRenderInProgress();
   ~GuiLayers();
+   int receiveEvent(WEvent * e);
 
 };
 

projects/mtg/src/Damage.cpp

@@ -49,7 +49,7 @@ int Damage::resolve(){
 
   //Send Damage event to listeners
   WEventDamage * e = NEW WEventDamage(this);
-  GameObserver::GetInstance()->mLayers->actionLayer()->receiveEvent(e);
+  GameObserver::GetInstance()->receiveEvent(e);
   delete e;
 
   return a;

projects/mtg/src/DuelLayers.cpp

@@ -62,4 +62,3 @@ MTGGuiPlay * DuelLayers::playLayer(){
 }
 
 
-

projects/mtg/src/GameObserver.cpp

@@ -439,6 +439,10 @@ void GameObserver::untapPhase(){
   currentPlayer->inPlay()->untapAll();
 }
 
+int GameObserver::receiveEvent(WEvent * e){
+  return mLayers->receiveEvent(e);
+}
+
 
 int GameObserver::isACreature(MTGCardInstance * card){
   return card->isACreature();

projects/mtg/src/GuiLayers.cpp

@@ -172,3 +172,12 @@ void GuiLayers::Render(){
     objects[i]->Render();
   }
 }
+
+
+int GuiLayers::receiveEvent(WEvent * e){
+  for (int i = 0; i < nbitems; i++){
+    objects[i]->receiveEvent(e);
+  }
+  return 1;
+}
+

projects/mtg/src/MTGGameZones.cpp

@@ -142,7 +142,7 @@ MTGCardInstance * MTGPlayerCards::putInZone(MTGCardInstance * card, MTGGameZone
     copy->changedZoneRecently = 1.f;
     GameObserver *g = GameObserver::GetInstance();
     WEvent * e = NEW WEventZoneChange(copy, from, to);
-    g->mLayers->actionLayer()->receiveEvent(e);
+    g->receiveEvent(e);
     delete e;
     return copy;
   }