From 642f5bb5157be8eab99e41a7cc1339e78dd1fb60 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Snoen?= Date: Sat, 21 Dec 2013 11:18:18 +0100 Subject: [PATCH] Fixed indentation mistakes --- projects/mtg/src/CardDescriptor.cpp | 2 +- projects/mtg/src/Damage.cpp | 4 ++-- projects/mtg/src/GameObserver.cpp | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/projects/mtg/src/CardDescriptor.cpp b/projects/mtg/src/CardDescriptor.cpp index 5901069a1..a35596891 100644 --- a/projects/mtg/src/CardDescriptor.cpp +++ b/projects/mtg/src/CardDescriptor.cpp @@ -229,7 +229,7 @@ MTGCardInstance * CardDescriptor::match(MTGCardInstance * card) } if ((CDdamager == -1 && (card->damageToOpponent || card->damageToController || card->damageToCreature)) || (CDdamager == 1 && !(card->damageToOpponent || card->damageToController || card->damageToCreature))) - { + { match = NULL; } diff --git a/projects/mtg/src/Damage.cpp b/projects/mtg/src/Damage.cpp index 74c55ab02..6626c4df8 100644 --- a/projects/mtg/src/Damage.cpp +++ b/projects/mtg/src/Damage.cpp @@ -194,8 +194,8 @@ int Damage::resolve() target->damageCount += damage;//the amount must be the actual damage so i changed this from 1 to damage, this fixes pdcount and odcount if (target->type_as_damageable == Damageable::DAMAGEABLE_MTGCARDINSTANCE){ ((MTGCardInstance*)target)->wasDealtDamage = true; - ((MTGCardInstance*)source)->damageToCreature = true; - } + ((MTGCardInstance*)source)->damageToCreature = true; + } if (target->type_as_damageable == Damageable::DAMAGEABLE_PLAYER) { if(target == source->controller()) diff --git a/projects/mtg/src/GameObserver.cpp b/projects/mtg/src/GameObserver.cpp index 303d6beff..80fb9a0f4 100644 --- a/projects/mtg/src/GameObserver.cpp +++ b/projects/mtg/src/GameObserver.cpp @@ -795,7 +795,7 @@ void GameObserver::gameStateBasedEffects() c->wasDealtDamage = false; c->damageToController = false; c->damageToOpponent = false; - c->damageToCreature = false; + c->damageToCreature = false; c->isAttacking = NULL; } for (int t = 0; t < nbcards; t++)