* fixed some boundary conditions for menu initialization

* changed # victories to be calculated value
* removed nbVictories accessor
This commit is contained in:
techdragon.nguyen@gmail.com
2010-11-20 10:11:06 +00:00
parent 4a0965c853
commit 36d25441e2
4 changed files with 10 additions and 25 deletions
-1
View File
@@ -39,7 +39,6 @@ public:
int percentVictories(); int percentVictories();
DeckStat * getDeckStat(string opponentsFile); DeckStat * getDeckStat(string opponentsFile);
int nbGames(); int nbGames();
int nbVictories();
}; };
class StatsWrapper class StatsWrapper
+1 -1
View File
@@ -141,7 +141,7 @@ bool DeckMenu::showDetailsScreen()
void DeckMenu::initMenuItems() void DeckMenu::initMenuItems()
{ {
float sY = mY + kVerticalMargin; 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; float y = mY + kVerticalMargin + i * kLineHeight;
DeckMenuItem * currentMenuItem = static_cast<DeckMenuItem*> (mObjects[i]); DeckMenuItem * currentMenuItem = static_cast<DeckMenuItem*> (mObjects[i]);
+1 -1
View File
@@ -66,7 +66,7 @@ void DeckMetaData::loadStatsForPlayer(Player * statsPlayer, string deckStatsFile
stats->load(deckStatsFileName.c_str()); stats->load(deckStatsFileName.c_str());
_nbGamesPlayed = stats->nbGames(); _nbGamesPlayed = stats->nbGames();
_percentVictories = stats->percentVictories(); _percentVictories = stats->percentVictories();
_victories = stats->nbVictories(); _victories = _nbGamesPlayed * (_percentVictories / 100.0f);
} }
} }
stats = NULL; stats = NULL;
+8 -22
View File
@@ -44,18 +44,6 @@ DeckStats::~DeckStats()
cleanStats(); cleanStats();
} }
int DeckStats::percentVictories(string opponentsFile)
{
map<string, DeckStat *>::iterator it = stats.find(opponentsFile);
if (it == stats.end())
{
return 50;
}
else
{
return (it->second->percentVictories());
}
}
DeckStat* DeckStats::getDeckStat(string opponentsFile) DeckStat* DeckStats::getDeckStat(string opponentsFile)
{ {
@@ -82,19 +70,17 @@ int DeckStats::nbGames()
return nbgames; return nbgames;
} }
int DeckStats::nbVictories() int DeckStats::percentVictories(string opponentsFile)
{ {
int victories = 0; map<string, DeckStat *>::iterator it = stats.find(opponentsFile);
int nbgames = 0; if (it == stats.end())
map<string, DeckStat *>::iterator it;
for (it = stats.begin(); it != stats.end(); it++)
{ {
DeckStat * d = it->second; return 50;
nbgames += d->nbgames; }
victories += d->victories; else
{
return (it->second->percentVictories());
} }
return victories;
} }
int DeckStats::percentVictories() int DeckStats::percentVictories()