diff --git a/projects/mtg/include/MTGCard.h b/projects/mtg/include/MTGCard.h index 049d33366..f9e984c72 100644 --- a/projects/mtg/include/MTGCard.h +++ b/projects/mtg/include/MTGCard.h @@ -54,6 +54,7 @@ class MTGCard { void removeColor(int color); int getColor(); int hasColor(int _color); + int countColors(); const char * colorToString(); void setMTGId(int id); diff --git a/projects/mtg/src/CardGui.cpp b/projects/mtg/src/CardGui.cpp index 92b43cb74..aa669c388 100644 --- a/projects/mtg/src/CardGui.cpp +++ b/projects/mtg/src/CardGui.cpp @@ -119,13 +119,8 @@ void CardGui::Render() JQuad * CardGui::alternateThumbQuad(MTGCard * card){ JQuad * q; - int nb_colors = 0; - for(int i=0;icolors[i]) - nb_colors++; - } - if(nb_colors > 1){ + if(card->countColors() > 1){ q = resources.RetrieveTempQuad("gold_thumb.jpg"); } else{ @@ -153,16 +148,9 @@ void CardGui::alternateRender(MTGCard * card, const Pos& pos){ float x = pos.actX; - int nb_colors = 0; - for(int i=0;icolors[i]) - nb_colors++; - } - - if(nb_colors > 1){ + if(card->countColors() > 1) { q = resources.RetrieveTempQuad("gold.jpg"); - } - else{ + } else { switch(card->getColor()) { case Constants::MTG_COLOR_ARTIFACT: q = resources.RetrieveTempQuad("artifact.jpg");break; diff --git a/projects/mtg/src/MTGCard.cpp b/projects/mtg/src/MTGCard.cpp index 26f6e522f..3c397ac2a 100644 --- a/projects/mtg/src/MTGCard.cpp +++ b/projects/mtg/src/MTGCard.cpp @@ -151,7 +151,7 @@ void MTGCard::removeColor(int _color){ } int MTGCard::getColor(){ - for (int i=0; i