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

Erwan

Browse Source 
- simple refactor of "putIn*" functions in MTGGameZones
This commit is contained in:
wagic.the.homebrew@gmail.com
2011-01-23 06:03:37 +00:00
parent 63b3bdfef6
commit 14f2e9b0f2
2 changed files with 9 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
projects/mtg/include/MTGGameZones.h
View File

@@ -171,7 +171,6 @@ class MTGPlayerCards {
MTGCardInstance * putInExile(MTGCardInstance * card); MTGCardInstance * putInExile(MTGCardInstance * card);
MTGCardInstance * putInLibrary(MTGCardInstance * card); MTGCardInstance * putInLibrary(MTGCardInstance * card);
MTGCardInstance * putInHand(MTGCardInstance * card); MTGCardInstance * putInHand(MTGCardInstance * card);
MTGCardInstance * putInBattlefield(MTGCardInstance * card);
MTGCardInstance * putInZone(MTGCardInstance * card, MTGGameZone * from, MTGGameZone * to); MTGCardInstance * putInZone(MTGCardInstance * card, MTGGameZone * from, MTGGameZone * to);
int isInPlay(MTGCardInstance * card); int isInPlay(MTGCardInstance * card);
int isInGrave(MTGCardInstance * card); int isInGrave(MTGCardInstance * card);

117
projects/mtg/src/MTGGameZones.cpp
View File

@@ -243,129 +243,30 @@ void MTGPlayerCards::showHand()
hand->debugPrint(); hand->debugPrint();
} }
// Moves a card to its owner's graveyard
MTGCardInstance * MTGPlayerCards::putInGraveyard(MTGCardInstance * card) MTGCardInstance * MTGPlayerCards::putInGraveyard(MTGCardInstance * card)
{ {
MTGCardInstance * copy = NULL; return putInZone(card, card->currentZone, card->owner->game->graveyard);
MTGGraveyard * grave = card->owner->game->graveyard;
if (inPlay->hasCard(card))
{
copy = putInZone(card, inPlay, grave);
}
else if (stack->hasCard(card))
{
copy = putInZone(card, stack, grave);
}
else
{
copy = putInZone(card, hand, grave);
}
return copy;
} }
// Moves a card to its owner's exile
MTGCardInstance * MTGPlayerCards::putInExile(MTGCardInstance * card) MTGCardInstance * MTGPlayerCards::putInExile(MTGCardInstance * card)
{ {
MTGCardInstance * copy = NULL; return putInZone(card, card->currentZone, card->owner->game->exile);
MTGRemovedFromGame * exile = card->owner->game->exile;
if (inPlay->hasCard(card))
{
copy = putInZone(card, inPlay, exile);
}
else if (stack->hasCard(card))
{
copy = putInZone(card, stack, exile);
}
else if (hand->hasCard(card))
{
copy = putInZone(card, hand, exile);
}
else if (graveyard->hasCard(card))
{
copy = putInZone(card, graveyard, exile);
}
else
{
copy = putInZone(card, hand, exile);
}
return copy;
} }
// Moves a card to its owner's library
MTGCardInstance * MTGPlayerCards::putInLibrary(MTGCardInstance * card) MTGCardInstance * MTGPlayerCards::putInLibrary(MTGCardInstance * card)
{ {
MTGCardInstance * copy = NULL; return putInZone(card, card->currentZone, card->owner->game->library);
MTGLibrary * library = card->owner->game->library;
MTGHand * hand = card->owner->game->hand;
if (inPlay->hasCard(card))
{
copy = putInZone(card, inPlay, library);
}
else if (stack->hasCard(card))
{
copy = putInZone(card, stack, library);
}
else if (graveyard->hasCard(card))
{
copy = putInZone(card, graveyard, library);
}
else
{
copy = putInZone(card, hand, library);
}
return copy;
} }
// Moves a card to its *owner's* (not controller!) hand
MTGCardInstance * MTGPlayerCards::putInHand(MTGCardInstance * card) MTGCardInstance * MTGPlayerCards::putInHand(MTGCardInstance * card)
{ {
MTGCardInstance * copy = NULL; return putInZone(card, card->currentZone, card->owner->game->hand);
MTGHand * hand = card->owner->game->hand;
if (inPlay->hasCard(card))
{
copy = putInZone(card, inPlay, hand);
}
else if (stack->hasCard(card))
{
copy = putInZone(card, stack, hand);
}
else if (graveyard->hasCard(card))
{
copy = putInZone(card, graveyard, hand);
}
else if (exile->hasCard(card))
{
copy = putInZone(card, exile, hand);
}
else
{
copy = putInZone(card, hand, hand);
}
return copy;
} }
MTGCardInstance * MTGPlayerCards::putInBattlefield(MTGCardInstance * card)
{
MTGCardInstance * copy = NULL;
MTGInPlay * InPlay = card->owner->game->battlefield;
if (inPlay->hasCard(card))
{
copy = putInZone(card, inPlay, InPlay);
}
else if (stack->hasCard(card))
{
copy = putInZone(card, stack, InPlay);
}
else if (graveyard->hasCard(card))
{
copy = putInZone(card, graveyard, InPlay);
}
else if (exile->hasCard(card))
{
copy = putInZone(card, exile, InPlay);
}
else
{
copy = putInZone(card, InPlay, InPlay);
}
return copy;
}
// Moves a card from one zone to another // Moves a card from one zone to another
// If the card is not actually in the expected "from" zone, does nothing and returns null // If the card is not actually in the expected "from" zone, does nothing and returns null