From 24df6bbb6fb1b81fb61694fa07a513ba6c01b4f4 Mon Sep 17 00:00:00 2001 From: Xawotihs Date: Sat, 1 Oct 2011 17:29:33 +0000 Subject: [PATCH] Fixed a crash occurring at booster purchase --- projects/mtg/src/MTGCardInstance.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/projects/mtg/src/MTGCardInstance.cpp b/projects/mtg/src/MTGCardInstance.cpp index 8e30fe1bd..cd2c5fa05 100644 --- a/projects/mtg/src/MTGCardInstance.cpp +++ b/projects/mtg/src/MTGCardInstance.cpp @@ -27,8 +27,12 @@ MTGCardInstance::MTGCardInstance() : initMTGCI(); } MTGCardInstance::MTGCardInstance(MTGCard * card, MTGPlayerCards * arg_belongs_to) : - CardPrimitive(card->data), MTGCard(card), Damageable((arg_belongs_to->owner)?arg_belongs_to->owner->getObserver():0, card->data->getToughness()), view(NULL) + CardPrimitive(card->data), MTGCard(card), Damageable(0, card->data->getToughness()), view(NULL) { + if(arg_belongs_to) + if(arg_belongs_to->owner) + observer = arg_belongs_to->owner->getObserver(); + initMTGCI(); model = card; attacker = 0;