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)
This commit is contained in:
@@ -6,31 +6,33 @@
|
||||
|
||||
class Player;
|
||||
|
||||
struct DamagerDamaged : TransientCardView {
|
||||
bool show;
|
||||
Player * damageSelecter;
|
||||
vector<Damage> damages;
|
||||
int damageToDeal;
|
||||
struct DamagerDamaged: TransientCardView
|
||||
{
|
||||
bool show;
|
||||
Player * damageSelecter;
|
||||
vector<Damage> damages;
|
||||
int damageToDeal;
|
||||
|
||||
void addDamage(int damage, DamagerDamaged* source);
|
||||
int removeDamagesTo(DamagerDamaged* target);
|
||||
int removeDamagesFrom(DamagerDamaged* source);
|
||||
void clearDamage();
|
||||
int sumDamages();
|
||||
bool hasLethalDamage();
|
||||
DamagerDamaged(MTGCardInstance* card, float x, float y, bool show, Player* damageSelecter);
|
||||
DamagerDamaged(MTGCardInstance* card, const Pos& ref, bool show, Player* damageSelecter);
|
||||
void addDamage(int damage, DamagerDamaged* source);
|
||||
int removeDamagesTo(DamagerDamaged* target);
|
||||
int removeDamagesFrom(DamagerDamaged* source);
|
||||
void clearDamage();
|
||||
int sumDamages();
|
||||
bool hasLethalDamage();
|
||||
DamagerDamaged(MTGCardInstance* card, float x, float y, bool show, Player* damageSelecter);
|
||||
DamagerDamaged(MTGCardInstance* card, const Pos& ref, bool show, Player* damageSelecter);
|
||||
|
||||
~DamagerDamaged();
|
||||
void Render(CombatStep mode);
|
||||
~DamagerDamaged();
|
||||
void Render(CombatStep mode);
|
||||
};
|
||||
|
||||
typedef DamagerDamaged DefenserDamaged;
|
||||
struct AttackerDamaged : DamagerDamaged {
|
||||
vector<DefenserDamaged*> blockers;
|
||||
AttackerDamaged(MTGCardInstance* card, float x, float y, bool show, Player* damageSelecter);
|
||||
AttackerDamaged(MTGCardInstance* card, const Pos& ref, bool show, Player* damageSelecter);
|
||||
~AttackerDamaged();
|
||||
struct AttackerDamaged: DamagerDamaged
|
||||
{
|
||||
vector<DefenserDamaged*> blockers;
|
||||
AttackerDamaged(MTGCardInstance* card, float x, float y, bool show, Player* damageSelecter);
|
||||
AttackerDamaged(MTGCardInstance* card, const Pos& ref, bool show, Player* damageSelecter);
|
||||
~AttackerDamaged();
|
||||
};
|
||||
|
||||
#endif
|
||||
|
||||
Reference in New Issue
Block a user