Mahtan/wagic
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed formatting

Browse Source
This commit is contained in:
Dmitry Panin
2013-12-02 04:16:25 +04:00
parent 9effa7c975
commit f08ddac77b
2 changed files with 70 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files
projects/mtg/include/AllAbilities.h
+2 -1
View File
@@ -2608,7 +2608,8 @@ public:
int removed(MTGCardInstance * card) int removed(MTGCardInstance * card)
{ {
if (abilities.find(card) != abilities.end() && !(forceDestroy == -1 && forcedAlive == 1))//only embelms have forcedestroy = -1 and forcedalive = 1 if (abilities.find(card) != abilities.end()
&& !(forceDestroy == -1 && forcedAlive == 1)) //only embelms have forcedestroy = -1 and forcedalive = 1
{ {
game->removeObserver(abilities[card]); game->removeObserver(abilities[card]);
abilities.erase(card); abilities.erase(card);
projects/mtg/src/AllAbilities.cpp
+10 -10
View File
@@ -5419,8 +5419,8 @@ AACastCard::AACastCard(GameObserver* observer, int _id, MTGCardInstance * _sourc
} }
void AACastCard::Update(float dt) void AACastCard::Update(float dt)
{ {
MTGAbility::Update(dt); MTGAbility::Update(dt);
if (processed) if (processed)
return; return;
@@ -5468,10 +5468,10 @@ AACastCard::AACastCard(GameObserver* observer, int _id, MTGCardInstance * _sourc
resolveSpell(); resolveSpell();
this->forceDestroy = 1; this->forceDestroy = 1;
return; return;
} }
int AACastCard::isReactingToTargetClick(Targetable * card){return 0;} int AACastCard::isReactingToTargetClick(Targetable * card){return 0;}
int AACastCard::reactToTargetClick(Targetable * object) int AACastCard::reactToTargetClick(Targetable * object)
{ {
if (MTGCardInstance * cObject = dynamic_cast<MTGCardInstance *>(object)) if (MTGCardInstance * cObject = dynamic_cast<MTGCardInstance *>(object))
return reactToClick(cObject); return reactToClick(cObject);
@@ -5486,16 +5486,16 @@ AACastCard::AACastCard(GameObserver* observer, int _id, MTGCardInstance * _sourc
return 1; return 1;
} }
return 0; return 0;
} }
MTGCardInstance * AACastCard::makeCard() MTGCardInstance * AACastCard::makeCard()
{ {
MTGCardInstance * card = NULL; MTGCardInstance * card = NULL;
MTGCard * cardData = MTGCollection()->getCardByName(cardNamed); MTGCard * cardData = MTGCollection()->getCardByName(cardNamed);
card = NEW MTGCardInstance(cardData, source->controller()->game); card = NEW MTGCardInstance(cardData, source->controller()->game);
source->controller()->game->temp->addCard(card); source->controller()->game->temp->addCard(card);
return card; return card;
} }
int AACastCard::resolveSpell() int AACastCard::resolveSpell()
{ {