From eaf4d94a2e259d19e7fe0b882247fa575c7207e8 Mon Sep 17 00:00:00 2001 From: "omegablast2002@yahoo.com" Date: Sun, 27 Jan 2013 19:35:52 +0000 Subject: [PATCH] this part didnt commit in last rev, it fixes the mana display. the progress is removed on this though, so you might not notice it until next release when you do a fresh install. any new decks for both player or ai will show the mana symbols after a match is completed. --- projects/mtg/src/DeckMenu.cpp | 4 ++-- projects/mtg/src/DeckStats.cpp | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/projects/mtg/src/DeckMenu.cpp b/projects/mtg/src/DeckMenu.cpp index b011f350c..0869fe623 100644 --- a/projects/mtg/src/DeckMenu.cpp +++ b/projects/mtg/src/DeckMenu.cpp @@ -124,8 +124,8 @@ void DeckMenu::RenderDeckManaColors() float manaIconY = 55; if (mSelectedDeck &&displayDeckMana) { - string deckManaColors = mSelectedDeck->getColorIndex(); - if ( deckManaColors.compare("") != 0 && ( deckManaColors.length() == 6 )) + string deckManaColors = mSelectedDeck->getColorIndex().c_str(); + if (deckManaColors.size() == 6) { // due to space constraints don't display icons for colorless mana. for( int colorIdx = Constants::MTG_COLOR_GREEN; colorIdx < Constants::MTG_COLOR_LAND; ++colorIdx ) diff --git a/projects/mtg/src/DeckStats.cpp b/projects/mtg/src/DeckStats.cpp index 71fd9b24f..3789d4288 100644 --- a/projects/mtg/src/DeckStats.cpp +++ b/projects/mtg/src/DeckStats.cpp @@ -372,7 +372,8 @@ string StatsWrapper::getManaColorIndex() oss << "1"; else oss <<"0"; - return oss.str(); + string index = oss.str(); + return index; }