diff --git a/projects/mtg/include/DeckStats.h b/projects/mtg/include/DeckStats.h index 7354bd122..6096d808e 100644 --- a/projects/mtg/include/DeckStats.h +++ b/projects/mtg/include/DeckStats.h @@ -39,7 +39,6 @@ public: int percentVictories(); DeckStat * getDeckStat(string opponentsFile); int nbGames(); - int nbVictories(); }; class StatsWrapper diff --git a/projects/mtg/src/DeckMenu.cpp b/projects/mtg/src/DeckMenu.cpp index 83fa860ab..8f5ba12ab 100644 --- a/projects/mtg/src/DeckMenu.cpp +++ b/projects/mtg/src/DeckMenu.cpp @@ -141,7 +141,7 @@ bool DeckMenu::showDetailsScreen() void DeckMenu::initMenuItems() { float sY = mY + kVerticalMargin; - for (int i = startId; i < startId + mCount; ++i) + for (int i = startId; i < mCount; ++i) { float y = mY + kVerticalMargin + i * kLineHeight; DeckMenuItem * currentMenuItem = static_cast (mObjects[i]); diff --git a/projects/mtg/src/DeckMetaData.cpp b/projects/mtg/src/DeckMetaData.cpp index 75acf5512..ddac4fb59 100644 --- a/projects/mtg/src/DeckMetaData.cpp +++ b/projects/mtg/src/DeckMetaData.cpp @@ -66,7 +66,7 @@ void DeckMetaData::loadStatsForPlayer(Player * statsPlayer, string deckStatsFile stats->load(deckStatsFileName.c_str()); _nbGamesPlayed = stats->nbGames(); _percentVictories = stats->percentVictories(); - _victories = stats->nbVictories(); + _victories = _nbGamesPlayed * (_percentVictories / 100.0f); } } stats = NULL; diff --git a/projects/mtg/src/DeckStats.cpp b/projects/mtg/src/DeckStats.cpp index 078c40f35..f3fcac6af 100644 --- a/projects/mtg/src/DeckStats.cpp +++ b/projects/mtg/src/DeckStats.cpp @@ -44,18 +44,6 @@ DeckStats::~DeckStats() cleanStats(); } -int DeckStats::percentVictories(string opponentsFile) -{ - map::iterator it = stats.find(opponentsFile); - if (it == stats.end()) - { - return 50; - } - else - { - return (it->second->percentVictories()); - } -} DeckStat* DeckStats::getDeckStat(string opponentsFile) { @@ -82,19 +70,17 @@ int DeckStats::nbGames() return nbgames; } -int DeckStats::nbVictories() +int DeckStats::percentVictories(string opponentsFile) { - int victories = 0; - int nbgames = 0; - map::iterator it; - for (it = stats.begin(); it != stats.end(); it++) + map::iterator it = stats.find(opponentsFile); + if (it == stats.end()) { - DeckStat * d = it->second; - nbgames += d->nbgames; - victories += d->victories; + return 50; + } + else + { + return (it->second->percentVictories()); } - - return victories; } int DeckStats::percentVictories()