From 2bb651c5b4ca6bd13cab2829bbdbc74fc73e271e Mon Sep 17 00:00:00 2001 From: "omegablast2002@yahoo.com" Date: Fri, 23 Sep 2011 19:05:10 +0000 Subject: [PATCH] fixed a crash in "white" rendering when you don't actually have the graphic for "white". --- projects/mtg/src/CardGui.cpp | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/projects/mtg/src/CardGui.cpp b/projects/mtg/src/CardGui.cpp index 7986ea65c..a3a499202 100644 --- a/projects/mtg/src/CardGui.cpp +++ b/projects/mtg/src/CardGui.cpp @@ -185,8 +185,11 @@ void CardGui::Render() if (isActiveConnectedParent) { JQuadPtr white = WResourceManager::Instance()->GetQuad("white"); - white->SetColor(ARGB(255,230,50,50)); - renderer->RenderQuad(white.get(), actX, actY, actT, 30 * actZ / 16, 42 * actZ / 16); + if(white) + { + white->SetColor(ARGB(255,230,50,50)); + renderer->RenderQuad(white.get(), actX, actY, actT, 30 * actZ / 16, 42 * actZ / 16); + } } // Am I a child of a selected card, or am I a child and myself being selected? @@ -209,8 +212,11 @@ void CardGui::Render() if (isActiveConnectedChild) { JQuadPtr white = WResourceManager::Instance()->GetQuad("white"); + if(white) + { white->SetColor(ARGB(255,0,0,255)); renderer->RenderQuad(white.get(), actX, actY, actT, 30 * actZ / 16, 42 * actZ / 16); + } } if (quad)