From e0f5a81dad87c83a561e5d376f6e29db2a25a237 Mon Sep 17 00:00:00 2001
From: "wagic.the.homebrew@gmail.com"
 <wagic.the.homebrew@gmail.com@01922e74-a4c3-11dd-a5cd-697bfd0a0cef>
Date: Sat, 19 Sep 2009 10:51:45 +0000
Subject: [PATCH] Erwan - Minor cleanup

---
 projects/mtg/include/GameObserver.h | 3 ---
 projects/mtg/src/GameObserver.cpp   | 6 ------
 2 files changed, 9 deletions(-)

diff --git a/projects/mtg/include/GameObserver.h b/projects/mtg/include/GameObserver.h
index 70370dffb..7f9f50fc4 100644
--- a/projects/mtg/include/GameObserver.h
+++ b/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();
diff --git a/projects/mtg/src/GameObserver.cpp b/projects/mtg/src/GameObserver.cpp
index 4b63d10fc..8b15b19cd 100644
--- a/projects/mtg/src/GameObserver.cpp
+++ b/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++;