diff --git a/projects/mtg/include/GameStateDuel.h b/projects/mtg/include/GameStateDuel.h index 4a818f366..012221e37 100644 --- a/projects/mtg/include/GameStateDuel.h +++ b/projects/mtg/include/GameStateDuel.h @@ -3,8 +3,9 @@ #include "../include/GameState.h" -#include "_includeAll.h" #include "../include/SimpleMenu.h" +#include "../include/MTGDeck.h" +#include "../include/GameObserver.h" #define CHOOSE_OPPONENT 7 @@ -13,6 +14,7 @@ class TestSuite; #endif class Credits; + class GameStateDuel: public GameState, public JGuiListener { private: diff --git a/projects/mtg/include/_includeAll.h b/projects/mtg/include/_includeAll.h deleted file mode 100644 index 19b694295..000000000 --- a/projects/mtg/include/_includeAll.h +++ /dev/null @@ -1,43 +0,0 @@ -#ifndef _INCLUDEALL_H_ -#define _INCLUDEALL_H_ - - -class MTGPlayerCards; -class MTGCardInstance; -class MTGCard; -class GameObserver; -class TexturesCache; -class MTGAbility; -class Player; -class CardGui; -class ActionElement; -class DuelLayers; -class MTGInPlay; - -class MTGGamePhase; - -#include "CardGui.h" -#include "GuiLayers.h" -#include "GuiCardsController.h" -#include "MTGGuiPlay.h" -#include "MTGGuiHand.h" -#include "ManaCost.h" -#include "TexturesCache.h" -#include "MTGAbility.h" -#include "MTGGameZones.h" -#include "ActionElement.h" -#include "ActionLayer.h" -#include "MTGGamePhase.h" -#include "DuelLayers.h" -#include "GameObserver.h" -#include "MTGDeck.h" -#include "Player.h" - - - - - - - - -#endif diff --git a/projects/mtg/template.vcproj b/projects/mtg/template.vcproj index 63e02abf1..fc1ed43b2 100644 --- a/projects/mtg/template.vcproj +++ b/projects/mtg/template.vcproj @@ -541,10 +541,6 @@ Name="Header Files" Filter="h;hpp;hxx;hm;inl" > - -