- Minor refactor of a few files: removed some unnecessary calls, etc...

2011-09-22 10:07:05 +00:00
parent ee4c7e23bd
commit f649fee465
5 changed files with 231 additions and 361 deletions
@@ -101,7 +101,7 @@ class AIPlayerBaka: public AIPlayer{
    virtual bool payTheManaCost(ManaCost * cost, MTGCardInstance * card = NULL,vector<MTGAbility*> gotPayment = vector<MTGAbility*>());
    virtual int getCreaturesInfo(Player * player, int neededInfo = INFO_NBCREATURES , int untapMode = 0, int canAttack = 0);
    virtual ManaCost * getPotentialMana(MTGCardInstance * card = NULL);
-    int selectAbility();
+    virtual int selectAbility();

 public:
    enum {
@@ -44,10 +44,17 @@ class MTGAbility : public ActionElement
 {
 private:
     ManaCost* mCost;
+
 protected:
    char menuText[50];

    GameObserver * game;
+
+     // returns target itself if it is a player, or its controller if it is a card
+     static Player * getPlayerFromTarget(Targetable * target);
+
+     // returns target itself if it is a player, or its controller if it is a card
+     static Player * getPlayerFromDamageable(Damageable * target);
 public:
    enum
    {
@@ -207,8 +214,6 @@ public:
        COUNTERS = 30,
 		PUT_INTO_PLAY_WITH_KICKER = 31,
 		STANDARD_FIZZLER = 32,
-
-
    };
 };