Erwan

- fix compilation issues introduced in r1727

projects/mtg/include/AllAbilities.h

@@ -13,6 +13,7 @@
 #include "Counters.h"
 #include "WEvent.h"
 #include "GuiStatic.h"
+#include "GameObserver.h"
 
 #include <JGui.h>
 #include <hge/hgeparticle.h>

projects/mtg/include/CardSelector.h

@@ -4,7 +4,6 @@
 #include <vector>
 #include <stack>
 #include "GuiLayers.h"
-#include "DuelLayers.h"
 #include "Pos.h"
 
 using std::vector;

projects/mtg/include/MTGAbility.h

@@ -4,7 +4,6 @@
 
 
 class MTGCardInstance;
-class GameObserver;
 class Spell;
 class Damageable;
 class PlayGuiObject;
@@ -14,6 +13,7 @@ class Player;
 class AManaProducer;
 class WEvent;
 
+#include "../include/GameObserver.h"
 #include "ActionElement.h"
 #include <string>
 #include <map>

projects/mtg/include/MTGCardInstance.h

@@ -7,7 +7,6 @@
 #include "MTGAbility.h"
 #include "WResourceManager.h"
 #include "ManaCost.h"
-#include "Blocker.h"
 #include "Damage.h"
 #include "Targetable.h"
 

projects/mtg/include/MTGRules.h

@@ -7,6 +7,7 @@
 #include "../include/MTGAbility.h"
 #include "../include/Counters.h"
 #include "../include/WEvent.h"
+#include "../include/CardSelector.h"
 
 class OtherAbilitiesEventReceiver:public MTGAbility{
 public:

projects/mtg/src/CardDisplay.cpp

@@ -3,6 +3,7 @@
 #include "../include/CardGui.h"
 #include "../include/TargetChooser.h"
 #include "../include/MTGGameZones.h"
+#include "../include/GameObserver.h"
 
 CardDisplay::CardDisplay() : mId(0), game(GameObserver::GetInstance()) {
   tc = NULL;

projects/mtg/src/CardGui.cpp

@@ -5,6 +5,7 @@
 #include "../include/Subtypes.h"
 #include "../include/Translate.h"
 #include "../include/MTGDefinitions.h"
+#include "../include/GameObserver.h"
 #include <Vector2D.h>
 #include <assert.h>
 

projects/mtg/src/CardSelector.cpp

@@ -4,6 +4,7 @@
 #include "../include/CardSelector.h"
 #include "../include/GuiHand.h"
 #include "Closest.cpp"
+#include "../include/GameObserver.h"
 
 using std::cout;
 

projects/mtg/src/Credits.cpp

@@ -6,6 +6,7 @@
 #include "../include/DeckStats.h"
 #include "../include/Translate.h"
 #include "../include/MTGDeck.h"
+#include "../include/GameObserver.h"
 
   CreditBonus::CreditBonus(int _value, string _text){
     value = _value;

projects/mtg/src/Damage.cpp

@@ -5,6 +5,7 @@
 #include "../include/WEvent.h"
 #include "../include/Translate.h"
 #include "../include/WResourceManager.h"
+#include "../include/GameObserver.h"
 
 Damage::Damage(MTGCardInstance * source, Damageable * target) {
   init(source, target, source->getPower(), DAMAGE_OTHER);

projects/mtg/src/DeckStats.cpp

@@ -1,6 +1,7 @@
 #include "../include/config.h"
 #include "../include/DeckStats.h"
 #include "../include/Player.h"
+#include "../include/GameObserver.h"
 
 DeckStats * DeckStats::mInstance = NULL;
 

projects/mtg/src/ExtraCost.cpp

@@ -3,6 +3,7 @@
 #include "../include/MTGCardInstance.h"
 #include "../include/Translate.h"
 #include "../include/config.h"
+#include "../include/Player.h"
 #include <JGE.h>
 
 ExtraCost::ExtraCost( TargetChooser *_tc):tc(_tc){

projects/mtg/src/GameObserver.cpp

@@ -1,7 +1,6 @@
 #include "../include/config.h"
 #include "../include/GameObserver.h"
 #include "../include/GameOptions.h"
-#include "../include/ConstraintResolver.h"
 #include "../include/CardGui.h"
 #include "../include/Damage.h"
 #include "../include/Rules.h"

projects/mtg/src/GuiAvatars.cpp

@@ -1,6 +1,7 @@
 #include "../include/config.h"
 #include "../include/GameApp.h"
 #include "../include/GuiAvatars.h"
+#include "../include/GameObserver.h"
 
 #define LIB_GRAVE_OFFSET 230
 

projects/mtg/src/GuiCombat.cpp

@@ -3,6 +3,7 @@
 #include "../include/GameApp.h"
 #include "../include/GuiCombat.h"
 #include "../include/AIPlayer.h"
+#include "../include/GameObserver.h"
 #include "Closest.cpp"
 
 static const float MARGIN = 70;

projects/mtg/src/GuiMana.cpp

@@ -1,6 +1,7 @@
 #include <iostream>
 #include "../include/GuiMana.h"
 #include "../include/OptionItem.h"
+#include "../include/Player.h"
 
 
 using std::cout;

projects/mtg/src/GuiPhaseBar.cpp

@@ -1,6 +1,7 @@
 #include "../include/config.h"
 #include "../include/GameApp.h"
 #include "../include/GuiPhaseBar.h"
+#include "../include/GameObserver.h"
 #include "../include/Translate.h"
 
 /*

projects/mtg/src/MTGAbility.cpp

@@ -7,7 +7,6 @@
 #include "../include/TargetChooser.h"
 #include "../include/CardGui.h"
 #include "../include/MTGDeck.h"
-#include "../include/Blocker.h"
 #include "../include/Translate.h"
 
 

projects/mtg/src/TestSuiteAI.cpp

@@ -5,6 +5,7 @@
 #include "../include/ActionLayer.h"
 #include "../include/GuiCombat.h"
 #include "../include/Rules.h"
+#include "../include/GameObserver.h"
 
 #include <string>
 using std::string;