No code change just reformatting of header files.

finishing up my reformatting of the source from November/December following the guidelines that were posted. some extra things I added: * Any empty virtual declarations were kept to one line. * Enums were split up into separate lines to promote uniformity across all headers. ( each header file had a different style for enums)
2011-01-21 18:01:14 +00:00
parent 6d3d4c1792
commit e53c16f700
101 changed files with 6128 additions and 4684 deletions
@@ -20,160 +20,197 @@ class Damageable;
 class Targetable;
 class CardDescriptor;

+class TargetChooser: public TargetsList
+{
+protected:
+    int forceTargetListReady;

-
-class TargetChooser: public TargetsList {
- protected:
-  int forceTargetListReady;
-
- public:
- enum{
-    UNSET = 0,
-    OPPONENT = -1,
-    CONTROLLER = 1,
-    TARGET_CONTROLLER = 2,
-		OWNER = 3
- };
+public:
+    enum
+    {
+        UNSET = 0,
+        OPPONENT = -1,
+        CONTROLLER = 1,
+        TARGET_CONTROLLER = 2,
+        OWNER = 3
+    };
    bool other;

-  TargetChooser(MTGCardInstance * card = NULL, int _maxtargets = -1, bool other = false);
+    TargetChooser(MTGCardInstance * card = NULL, int _maxtargets = -1, bool other = false);

-  MTGCardInstance * source;
-  MTGCardInstance * targetter; //Optional, usually equals source, used for protection from...
-  
-  int maxtargets; //Set to -1 for "unlimited"
-  bool validTargetsExist();
-  virtual int setAllZones(){return 0;}
-  virtual bool targetsZone(MTGGameZone * z){return false;};
-  int ForceTargetListReady();
-  int targetsReadyCheck();
-  virtual int addTarget(Targetable * target);
-  virtual bool canTarget(Targetable * _target);
-  virtual int full(){if (maxtargets != -1 && cursor>=maxtargets) {return 1;} else{return 0;}};
-  virtual int ready(){return cursor;};
-  virtual ~TargetChooser(){};
-  int targetListSet();
-  virtual TargetChooser* clone() const = 0;
+    MTGCardInstance * source;
+    MTGCardInstance * targetter; //Optional, usually equals source, used for protection from...
+
+    int maxtargets; //Set to -1 for "unlimited"
+    bool validTargetsExist();
+    virtual int setAllZones()
+    {
+        return 0;
+    }
+    virtual bool targetsZone(MTGGameZone * z)
+    {
+        return false;
+    }
+    ;
+    int ForceTargetListReady();
+    int targetsReadyCheck();
+    virtual int addTarget(Targetable * target);
+    virtual bool canTarget(Targetable * _target);
+    virtual int full()
+    {
+        if (maxtargets != -1 && cursor >= maxtargets)
+        {
+            return 1;
+        }
+        else
+        {
+            return 0;
+        }
+    }
+    ;
+    virtual int ready()
+    {
+        return cursor;
+    }
+    ;
+    virtual ~TargetChooser()
+    {
+    }
+    ;
+    int targetListSet();
+    virtual TargetChooser* clone() const = 0;
 };

-
-class TargetChooserFactory{
- public:
-  TargetChooser * createTargetChooser(string s, MTGCardInstance * card, MTGAbility * ability = NULL);
-  TargetChooser * createTargetChooser(MTGCardInstance * card);
-};
-
-
-class TargetZoneChooser:public TargetChooser{
- public:
-  int zones[15];
-  int nbzones;
-  int init(int * _zones, int _nbzones);
-  bool targetsZone(MTGGameZone * z);
-  TargetZoneChooser(MTGCardInstance * card = NULL, int _maxtargets = 1, bool other = false);
-  TargetZoneChooser(int * _zones, int _nbzones, MTGCardInstance * card = NULL, int _maxtargets = 1, bool other = false);
-  virtual bool canTarget(Targetable * _card);
-  int setAllZones();
-  virtual TargetZoneChooser * clone() const;
-};
-
-class CardTargetChooser:public TargetZoneChooser {
-protected:
-  MTGCardInstance * validTarget;
+class TargetChooserFactory
+{
 public:
-  CardTargetChooser(MTGCardInstance * card, MTGCardInstance * source, int * zones = NULL, int nbzones = 0);
-  virtual bool canTarget(Targetable * target);
-  virtual CardTargetChooser * clone() const;
+    TargetChooser * createTargetChooser(string s, MTGCardInstance * card, MTGAbility * ability = NULL);
+    TargetChooser * createTargetChooser(MTGCardInstance * card);
 };

-
-class CreatureTargetChooser:public TargetZoneChooser{
- public:
-  CreatureTargetChooser(int * _zones, int _nbzones,MTGCardInstance * card = NULL, int _maxtargets = 1, bool other = false);
-  CreatureTargetChooser(MTGCardInstance * card = NULL, int _maxtargets = 1, bool other = false);
-  virtual bool canTarget(Targetable * _card);
-  virtual CreatureTargetChooser * clone() const;
-
+class TargetZoneChooser: public TargetChooser
+{
+public:
+    int zones[15];
+    int nbzones;
+    int init(int * _zones, int _nbzones);
+    bool targetsZone(MTGGameZone * z);
+    TargetZoneChooser(MTGCardInstance * card = NULL, int _maxtargets = 1, bool other = false);
+    TargetZoneChooser(int * _zones, int _nbzones, MTGCardInstance * card = NULL, int _maxtargets = 1, bool other = false);
+    virtual bool canTarget(Targetable * _card);
+    int setAllZones();
+    virtual TargetZoneChooser * clone() const;
 };

-
-class DamageableTargetChooser:public CreatureTargetChooser{
- public:
- DamageableTargetChooser(int * _zones, int _nbzones,MTGCardInstance * card = NULL, int _maxtargets = 1, bool other = false):CreatureTargetChooser( _zones,_nbzones, card, _maxtargets,other){};
- DamageableTargetChooser(MTGCardInstance * card = NULL, int _maxtargets = 1, bool other = false):CreatureTargetChooser(card, _maxtargets,other){};
-  virtual bool canTarget(Targetable * target);
-  virtual DamageableTargetChooser * clone() const;
-};
-
-
-class PlayerTargetChooser:public TargetChooser{
+class CardTargetChooser: public TargetZoneChooser
+{
 protected:
-  Player * p; //In Case we can only target a specific player
- public:
- PlayerTargetChooser(MTGCardInstance * card = NULL, int _maxtargets = 1, Player *_p = NULL);
-  virtual bool canTarget(Targetable * target);
-  virtual PlayerTargetChooser * clone() const;
+    MTGCardInstance * validTarget;
+public:
+    CardTargetChooser(MTGCardInstance * card, MTGCardInstance * source, int * zones = NULL, int nbzones = 0);
+    virtual bool canTarget(Targetable * target);
+    virtual CardTargetChooser * clone() const;
 };

-class TypeTargetChooser:public TargetZoneChooser{
- public:
-  int nbtypes;
-  int types[10];
-  TypeTargetChooser(const char * _type, MTGCardInstance * card = NULL, int _maxtargets = 1, bool other = false);
-  TypeTargetChooser(const char * _type, int * _zones, int nbzones, MTGCardInstance * card = NULL, int _maxtargets = 1, bool other = false);
-  void addType(int type);
-  void addType(const char * type);
-  virtual bool canTarget(Targetable * target);
-  virtual TypeTargetChooser * clone() const;
+class CreatureTargetChooser: public TargetZoneChooser
+{
+public:
+    CreatureTargetChooser(int * _zones, int _nbzones, MTGCardInstance * card = NULL, int _maxtargets = 1, bool other = false);
+    CreatureTargetChooser(MTGCardInstance * card = NULL, int _maxtargets = 1, bool other = false);
+    virtual bool canTarget(Targetable * _card);
+    virtual CreatureTargetChooser * clone() const;
+
 };

-class DescriptorTargetChooser:public TargetZoneChooser{
- public:
-  CardDescriptor  * cd;
-  DescriptorTargetChooser(CardDescriptor * _cd, MTGCardInstance * card = NULL, int _maxtargets = 1, bool other = false);
-  DescriptorTargetChooser(CardDescriptor * _cd, int * _zones, int nbzones, MTGCardInstance * card = NULL, int _maxtargets = 1, bool other = false);
-  virtual bool canTarget(Targetable * target);
-  ~DescriptorTargetChooser();
-  virtual DescriptorTargetChooser * clone() const;
+class DamageableTargetChooser: public CreatureTargetChooser
+{
+public:
+    DamageableTargetChooser(int * _zones, int _nbzones, MTGCardInstance * card = NULL, int _maxtargets = 1, bool other = false) :
+        CreatureTargetChooser(_zones, _nbzones, card, _maxtargets, other)
+    {
+    }
+    ;
+    DamageableTargetChooser(MTGCardInstance * card = NULL, int _maxtargets = 1, bool other = false) :
+        CreatureTargetChooser(card, _maxtargets, other)
+    {
+    }
+    ;
+    virtual bool canTarget(Targetable * target);
+    virtual DamageableTargetChooser * clone() const;
 };

-
-class SpellTargetChooser:public TargetChooser{
- public:
-  int color;
-  SpellTargetChooser( MTGCardInstance * card = NULL,int _color = -1, int _maxtargets = 1 , bool other = false);
-  virtual bool canTarget(Targetable * target);
-  virtual SpellTargetChooser * clone() const;
+class PlayerTargetChooser: public TargetChooser
+{
+protected:
+    Player * p; //In Case we can only target a specific player
+public:
+    PlayerTargetChooser(MTGCardInstance * card = NULL, int _maxtargets = 1, Player *_p = NULL);
+    virtual bool canTarget(Targetable * target);
+    virtual PlayerTargetChooser * clone() const;
 };

-class SpellOrPermanentTargetChooser:public TargetZoneChooser{
- public:
-  int color;
-  SpellOrPermanentTargetChooser(MTGCardInstance * card = NULL,int _color = -1 , int _maxtargets = 1, bool other = false);
-  virtual bool canTarget(Targetable * target);
-  virtual SpellOrPermanentTargetChooser * clone() const;
+class TypeTargetChooser: public TargetZoneChooser
+{
+public:
+    int nbtypes;
+    int types[10];
+    TypeTargetChooser(const char * _type, MTGCardInstance * card = NULL, int _maxtargets = 1, bool other = false);
+    TypeTargetChooser(const char * _type, int * _zones, int nbzones, MTGCardInstance * card = NULL, int _maxtargets = 1, bool other = false);
+    void addType(int type);
+    void addType(const char * type);
+    virtual bool canTarget(Targetable * target);
+    virtual TypeTargetChooser * clone() const;
 };

+class DescriptorTargetChooser: public TargetZoneChooser
+{
+public:
+    CardDescriptor * cd;
+    DescriptorTargetChooser(CardDescriptor * _cd, MTGCardInstance * card = NULL, int _maxtargets = 1, bool other = false);
+    DescriptorTargetChooser(CardDescriptor * _cd, int * _zones, int nbzones, MTGCardInstance * card = NULL, int _maxtargets = 1, bool other = false);
+    virtual bool canTarget(Targetable * target);
+    ~DescriptorTargetChooser();
+    virtual DescriptorTargetChooser * clone() const;
+};

+class SpellTargetChooser: public TargetChooser
+{
+public:
+    int color;
+    SpellTargetChooser(MTGCardInstance * card = NULL, int _color = -1, int _maxtargets = 1, bool other = false);
+    virtual bool canTarget(Targetable * target);
+    virtual SpellTargetChooser * clone() const;
+};

-class DamageTargetChooser:public TargetChooser{
- public:
-  int color;
-  int state;
-  DamageTargetChooser( MTGCardInstance * card = NULL,int _color = -1 , int _maxtargets = 1, int state = NOT_RESOLVED);
-  virtual bool canTarget(Targetable * target);
-  virtual DamageTargetChooser * clone() const;
+class SpellOrPermanentTargetChooser: public TargetZoneChooser
+{
+public:
+    int color;
+    SpellOrPermanentTargetChooser(MTGCardInstance * card = NULL, int _color = -1, int _maxtargets = 1, bool other = false);
+    virtual bool canTarget(Targetable * target);
+    virtual SpellOrPermanentTargetChooser * clone() const;
+};
+
+class DamageTargetChooser: public TargetChooser
+{
+public:
+    int color;
+    int state;
+    DamageTargetChooser(MTGCardInstance * card = NULL, int _color = -1, int _maxtargets = 1, int state = NOT_RESOLVED);
+    virtual bool canTarget(Targetable * target);
+    virtual DamageTargetChooser * clone() const;
 };

 //Should only be used for triggered abilities.
-class TriggerTargetChooser:public TargetChooser{
+class TriggerTargetChooser: public TargetChooser
+{
 public:
-  Targetable * target;
-  int triggerTarget;
-  TriggerTargetChooser(int _triggerTarget);
-  virtual bool targetsZone(MTGGameZone * z);
-  virtual bool canTarget(Targetable * _target);
-  virtual TriggerTargetChooser * clone() const;
+    Targetable * target;
+    int triggerTarget;
+    TriggerTargetChooser(int _triggerTarget);
+    virtual bool targetsZone(MTGGameZone * z);
+    virtual bool canTarget(Targetable * _target);
+    virtual TriggerTargetChooser * clone() const;
 };

 #endif