Simplified the parsing, now the TestSuite reworks on Windows.

This commit is contained in:
Xawotihs
2011-10-01 17:07:11 +00:00
parent d47ece1202
commit daf362f736
8 changed files with 193 additions and 7 deletions
+2
View File
@@ -39,6 +39,8 @@ public:
virtual int poisoned(){return 0;}
virtual int prevented(){return 0;}
virtual JQuadPtr getIcon(){return JQuadPtr();}
bool parseLine(const string& s);
};
class Damage: public Interruptible
+2
View File
@@ -115,6 +115,7 @@ class MTGGameZone {
bool needShuffle;
virtual const char * getName(){return "zone";};
virtual ostream& toString(ostream&) const;
bool parseLine(const string& s);
};
class MTGLibrary: public MTGGameZone {
@@ -197,6 +198,7 @@ public:
int isInPlay(MTGCardInstance * card);
int isInGrave(MTGCardInstance * card);
int isInZone(MTGCardInstance * card,MTGGameZone * zone);
bool parseLine(const string& s);
};
ostream& operator<<(ostream&, const MTGGameZone&);
+2 -1
View File
@@ -35,7 +35,7 @@ public:
string deckFileSmall;
string deckName;
string phaseRing;
int offerInterruptOnPhase;
int offerInterruptOnPhase;
Player(GameObserver *observer, string deckFile, string deckFileSmall, MTGDeck * deck = NULL);
virtual ~Player();
virtual void setObserver(GameObserver*g);
@@ -97,6 +97,7 @@ public:
std::string GetCurrentDeckStatsFile();
friend istream& operator>>(istream& in, Player& p);
bool parseLine(const string& s);
};
class HumanPlayer: public Player