Latest min-max branch

2015-08-25 23:29:58 +02:00
parent 5061f7c37f
commit 504160a740
6 changed files with 101 additions and 5 deletions
@@ -43,7 +43,7 @@ public:
    };

    friend ostream& operator<<(ostream&, const Action&);
-	  friend istream& operator>>(istream&, Action&);
+    friend istream& operator>>(istream&, Action&);
 };

 class AIAction
@@ -84,6 +84,10 @@ public:
    {
    };
    int Act();
+    ostream& logSimpleAct(ostream& out, MTGCardInstance* click);
+    ostream& logMultiAct(ostream& out, vector<Targetable*>& actionTargets);
+
+    friend ostream& operator<<(ostream& out, AIAction& a);
 };


@@ -52,7 +52,6 @@ class GameObserver{
  string startupGameSerialized;
  bool parseLine(const string& s);
  virtual void logAction(const string& s);
-  bool processAction(const string& s);
  bool processActions(bool undo
                    #ifdef TESTSUITE
                    , TestSuiteGame* testgame
@@ -69,6 +68,7 @@ class GameObserver{
                    );

 public:
+  bool processAction(const string& s);
  int currentPlayerId;
  CombatStep combatStep;
  int turn;
@@ -105,7 +105,7 @@ public:
    std::string GetCurrentDeckStatsFile();
    virtual bool parseLine(const string& s);
    friend ostream& operator<<(ostream&, const Player&);
-	  friend istream& operator>>(istream&, Player&);
+    friend istream& operator>>(istream&, Player&);
    bool operator<(Player& aPlayer);
    bool isDead();
 };