Erwan

- Minor cleanup

projects/mtg/include/GameObserver.h

@@ -6,7 +6,6 @@
 #include "DuelLayers.h"
 #include "MTGCardInstance.h"
 #include "PlayGuiObject.h"
-#include "DuelLayers.h"
 #include "TargetChooser.h"
 #include "PhaseRing.h"
 #include "ReplacementEffects.h"
@@ -30,7 +29,6 @@ class GameObserver{
 
   int nbPlayers;
   int currentPlayerId;
-  int currentRound;
 
  public:
   CombatStep combatStep;
@@ -53,7 +51,6 @@ class GameObserver{
   void stackObjectClicked(Interruptible * action);
 
   void cardClick(MTGCardInstance * card,Targetable * _object = NULL );
-  int enteringPhase(int phase);
   int getCurrentGamePhase();
   void nextCombatStep();
   void userRequestNextGamePhase();

projects/mtg/src/GameObserver.cpp

@@ -1,6 +1,5 @@
 #include "../include/config.h"
 #include "../include/GameObserver.h"
-
 #include "../include/GameOptions.h"
 #include "../include/ConstraintResolver.h"
 #include "../include/CardGui.h"
@@ -42,7 +41,6 @@ GameObserver::GameObserver(Player * _players[], int _nb_players){
   isInterrupting = NULL;
   currentPlayerId = 0;
   nbPlayers = _nb_players;
-  currentRound  = 1;
   currentGamePhase = -1;
   targetChooser = NULL;
   cardWaitingForTargets = NULL;
@@ -68,10 +66,6 @@ Player * GameObserver::opponent(){
   return players[index];
 }
 
-int GameObserver::enteringPhase(int phase){
-  //TODO
-  return 0;
-}
 
 void GameObserver::nextPlayer(){
   turn++;