From 703a9b7c6c130af60d0b0ef54756e24b704beecf Mon Sep 17 00:00:00 2001 From: "techdragon.nguyen@gmail.com" Date: Mon, 4 Oct 2010 16:27:39 +0000 Subject: [PATCH] Issue: 474 modified player status to recognize that test suite has been activated. This is to allow deactivation of "phase skip automation" game setting during test suite. TODO: fix "Phase Skip Automation" such that if turned on the test suite does not break. This fix should be considered temporary --- projects/mtg/include/Player.h | 9 +++++++++ projects/mtg/include/TestSuiteAI.h | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/projects/mtg/include/Player.h b/projects/mtg/include/Player.h index eae67ba64..5d774a4e2 100644 --- a/projects/mtg/include/Player.h +++ b/projects/mtg/include/Player.h @@ -15,12 +15,21 @@ class Player: public Damageable{ ManaPool * manaPool; public: + enum ENUM_PLAY_MODE + { + MODE_TEST_SUITE, + MODE_HUMAN, + MODE_AI, + }; + + virtual void End(); int typeAsTarget(){return TARGET_PLAYER;} const string getDisplayName() const; virtual int displayStack(){return 1;} JTexture * mAvatarTex; JQuad * mAvatar; + int playMode; int canPutLandsIntoPlay; int nomaxhandsize; int castedspellsthisturn; diff --git a/projects/mtg/include/TestSuiteAI.h b/projects/mtg/include/TestSuiteAI.h index 7b7b154b7..693d83219 100644 --- a/projects/mtg/include/TestSuiteAI.h +++ b/projects/mtg/include/TestSuiteAI.h @@ -88,7 +88,7 @@ class TestSuiteAI:public AIPlayerBaka{ public: TestSuite * suite; float timer; - int playMode; + TestSuiteAI(TestSuite * suite, int playerId); virtual int Act(float dt); virtual int displayStack();