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

Erwan

Browse Source 
- fixed compilation issues
- fixed bug with persuasion
This commit is contained in:
wagic.the.homebrew
2009-03-18 10:39:38 +00:00
parent bc7c689eab
commit 070e24ec7a
6 changed files with 9 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
projects/mtg/src/MTGCardInstance.cpp
+1 -1
View File
@@ -201,7 +201,7 @@ int MTGCardInstance::hasSummoningSickness(){
int MTGCardInstance::changeController(Player * newController){
Player * originalOwner = controller();
if (originalOwner == newController) return 0;
MTGCardInstance * copy = originalOwner->game->inPlay->removeCard(this);
MTGCardInstance * copy = originalOwner->game->inPlay->removeCard(this,0);
newController->game->inPlay->addCard(copy);
//summoningSickness = 1;
return 1;
projects/mtg/src/MTGGameZones.cpp
+3 -9
View File
@@ -95,14 +95,9 @@ MTGCardInstance * MTGPlayerCards::putInGraveyard(MTGCardInstance * card){
MTGCardInstance * MTGPlayerCards::putInZone(MTGCardInstance * card, MTGGameZone * from, MTGGameZone * to){
MTGCardInstance * copy = NULL;
//Special case, a card is not a new object if it goes from inplay to inplay, because it technically doesn't change zone
int newObject = 1;
if ((from = g->players[0]->game->inPlay || from = g->players[1]->game->inPlay) &&
(to = g->players[0]->game->inPlay || to = g->players[1]->game->inPlay) {
newObject = 0;
}
if (copy = from->removeCard(card,newObject)){
GameObserver *g = GameObserver::GetInstance();
if (copy = from->removeCard(card)){
if (GameOptions::GetInstance()->values[OPTIONS_SFXVOLUME].getIntValue() > 0){
if (to == graveyard){
@@ -114,7 +109,6 @@ MTGCardInstance * MTGPlayerCards::putInZone(MTGCardInstance * card, MTGGameZone
}
if (card->isToken){
GameObserver *g = GameObserver::GetInstance();
if (to != g->players[0]->game->inPlay && to != g->players[1]->game->inPlay){
//Token leaves play: we destroy it
//TODO DELETE Object