From bd6c1a24071d91ec6751e72811088498ad16d39c Mon Sep 17 00:00:00 2001 From: "wagic.the.homebrew@gmail.com" Date: Mon, 18 Jan 2010 12:43:30 +0000 Subject: [PATCH] Erwan - fix compilation issues introduced in r1727 --- projects/mtg/include/AllAbilities.h | 1 + projects/mtg/include/CardSelector.h | 1 - projects/mtg/include/MTGAbility.h | 2 +- projects/mtg/include/MTGCardInstance.h | 1 - projects/mtg/include/MTGRules.h | 1 + projects/mtg/src/CardDisplay.cpp | 1 + projects/mtg/src/CardGui.cpp | 1 + projects/mtg/src/CardSelector.cpp | 1 + projects/mtg/src/Credits.cpp | 1 + projects/mtg/src/Damage.cpp | 1 + projects/mtg/src/DeckStats.cpp | 1 + projects/mtg/src/ExtraCost.cpp | 1 + projects/mtg/src/GameObserver.cpp | 1 - projects/mtg/src/GuiAvatars.cpp | 1 + projects/mtg/src/GuiCombat.cpp | 1 + projects/mtg/src/GuiMana.cpp | 1 + projects/mtg/src/GuiPhaseBar.cpp | 1 + projects/mtg/src/MTGAbility.cpp | 1 - projects/mtg/src/TestSuiteAI.cpp | 1 + 19 files changed, 15 insertions(+), 5 deletions(-) diff --git a/projects/mtg/include/AllAbilities.h b/projects/mtg/include/AllAbilities.h index 97efc28aa..7cab6d008 100644 --- a/projects/mtg/include/AllAbilities.h +++ b/projects/mtg/include/AllAbilities.h @@ -13,6 +13,7 @@ #include "Counters.h" #include "WEvent.h" #include "GuiStatic.h" +#include "GameObserver.h" #include #include diff --git a/projects/mtg/include/CardSelector.h b/projects/mtg/include/CardSelector.h index 2a94cd882..f11748da9 100644 --- a/projects/mtg/include/CardSelector.h +++ b/projects/mtg/include/CardSelector.h @@ -4,7 +4,6 @@ #include #include #include "GuiLayers.h" -#include "DuelLayers.h" #include "Pos.h" using std::vector; diff --git a/projects/mtg/include/MTGAbility.h b/projects/mtg/include/MTGAbility.h index 98fd5308d..d80ab2f0c 100644 --- a/projects/mtg/include/MTGAbility.h +++ b/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 #include diff --git a/projects/mtg/include/MTGCardInstance.h b/projects/mtg/include/MTGCardInstance.h index 45888d97f..bfdfdd448 100644 --- a/projects/mtg/include/MTGCardInstance.h +++ b/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" diff --git a/projects/mtg/include/MTGRules.h b/projects/mtg/include/MTGRules.h index fcf940dd4..829022a59 100644 --- a/projects/mtg/include/MTGRules.h +++ b/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: diff --git a/projects/mtg/src/CardDisplay.cpp b/projects/mtg/src/CardDisplay.cpp index 8b2b351e7..7657b0f1f 100644 --- a/projects/mtg/src/CardDisplay.cpp +++ b/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; diff --git a/projects/mtg/src/CardGui.cpp b/projects/mtg/src/CardGui.cpp index 499b68747..06aad9f74 100644 --- a/projects/mtg/src/CardGui.cpp +++ b/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 #include diff --git a/projects/mtg/src/CardSelector.cpp b/projects/mtg/src/CardSelector.cpp index 630d102a9..2fc164bf5 100644 --- a/projects/mtg/src/CardSelector.cpp +++ b/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; diff --git a/projects/mtg/src/Credits.cpp b/projects/mtg/src/Credits.cpp index a2d51bb44..ffe30b825 100644 --- a/projects/mtg/src/Credits.cpp +++ b/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; diff --git a/projects/mtg/src/Damage.cpp b/projects/mtg/src/Damage.cpp index 8f13b5cba..dfec42afe 100644 --- a/projects/mtg/src/Damage.cpp +++ b/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); diff --git a/projects/mtg/src/DeckStats.cpp b/projects/mtg/src/DeckStats.cpp index 8a8e6905d..c53c16115 100644 --- a/projects/mtg/src/DeckStats.cpp +++ b/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; diff --git a/projects/mtg/src/ExtraCost.cpp b/projects/mtg/src/ExtraCost.cpp index 8cda1a548..31322cf06 100644 --- a/projects/mtg/src/ExtraCost.cpp +++ b/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 ExtraCost::ExtraCost( TargetChooser *_tc):tc(_tc){ diff --git a/projects/mtg/src/GameObserver.cpp b/projects/mtg/src/GameObserver.cpp index 4f14571ce..85f02f27b 100644 --- a/projects/mtg/src/GameObserver.cpp +++ b/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" diff --git a/projects/mtg/src/GuiAvatars.cpp b/projects/mtg/src/GuiAvatars.cpp index c2bb311af..7218f2af1 100644 --- a/projects/mtg/src/GuiAvatars.cpp +++ b/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 diff --git a/projects/mtg/src/GuiCombat.cpp b/projects/mtg/src/GuiCombat.cpp index 2d9e13b85..e40df3128 100644 --- a/projects/mtg/src/GuiCombat.cpp +++ b/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; diff --git a/projects/mtg/src/GuiMana.cpp b/projects/mtg/src/GuiMana.cpp index a475d1803..0b0f9bff4 100644 --- a/projects/mtg/src/GuiMana.cpp +++ b/projects/mtg/src/GuiMana.cpp @@ -1,6 +1,7 @@ #include #include "../include/GuiMana.h" #include "../include/OptionItem.h" +#include "../include/Player.h" using std::cout; diff --git a/projects/mtg/src/GuiPhaseBar.cpp b/projects/mtg/src/GuiPhaseBar.cpp index c7c010c2f..27e34ab30 100644 --- a/projects/mtg/src/GuiPhaseBar.cpp +++ b/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" /* diff --git a/projects/mtg/src/MTGAbility.cpp b/projects/mtg/src/MTGAbility.cpp index f63611ec1..47ded38b3 100644 --- a/projects/mtg/src/MTGAbility.cpp +++ b/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" diff --git a/projects/mtg/src/TestSuiteAI.cpp b/projects/mtg/src/TestSuiteAI.cpp index d929d5719..3c5b3e6c2 100644 --- a/projects/mtg/src/TestSuiteAI.cpp +++ b/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 using std::string;