From c3f99786fc22edd819902173bff1e8db1d21b878 Mon Sep 17 00:00:00 2001 From: wrenczes Date: Fri, 19 Nov 2010 01:30:00 +0000 Subject: [PATCH] Don't draw counter text when the draw mode is kHidden; removed two unused member functions. --- projects/mtg/include/CardGui.h | 6 ------ projects/mtg/src/CardGui.cpp | 17 ++++------------- 2 files changed, 4 insertions(+), 19 deletions(-) diff --git a/projects/mtg/include/CardGui.h b/projects/mtg/include/CardGui.h index 74eeb5dc3..54e5e2f9f 100644 --- a/projects/mtg/include/CardGui.h +++ b/projects/mtg/include/CardGui.h @@ -29,14 +29,8 @@ struct CardGui : public PlayGuiObject { /* ** Tries to render the Big version of a card picture, backups to text version in case of failure */ - void RenderBig(const Pos&); static void RenderBig(MTGCard * card, const Pos& pos); - /* - ** Renders Text Version of a card - */ - void AlternateRenderBig(const Pos&); - void RenderCountersBig(const Pos& pos); static void AlternateRender(MTGCard * card, const Pos& pos); static void TinyCropRender(MTGCard * card, const Pos& pos, JQuad * quad); diff --git a/projects/mtg/src/CardGui.cpp b/projects/mtg/src/CardGui.cpp index 6d685c071..7e933b557 100644 --- a/projects/mtg/src/CardGui.cpp +++ b/projects/mtg/src/CardGui.cpp @@ -76,7 +76,10 @@ void CardGui::Update(float dt) void CardGui::DrawCard(const Pos& inPosition, int inMode) { DrawCard(card, inPosition, inMode); - RenderCountersBig(inPosition); + if (inMode != DrawMode::kHidden) + { + RenderCountersBig(inPosition); + } } void CardGui::DrawCard(MTGCard* inCard, const Pos& inPosition, int inMode) @@ -706,12 +709,6 @@ font->SetColor(ARGB((int)pos.actA, 0, 0, 0)); font->SetScale(backup_scale); } -void CardGui::AlternateRenderBig(const Pos& pos) -{ - AlternateRender(card, pos); - RenderCountersBig(pos); -} - //Renders a big card on screen. Defaults to the "alternate" rendering if no image is found void CardGui::RenderBig(MTGCard* card, const Pos& pos) { @@ -787,12 +784,6 @@ void CardGui::RenderCountersBig(const Pos& pos) } } -void CardGui::RenderBig(const Pos& pos) -{ - RenderBig(card, pos); - RenderCountersBig(pos); -} - MTGCardInstance* CardView::getCard() { return card;