Miroirs/eliot
1
0
Fork 0
mirror of git://git.savannah.nongnu.org/eliot.git synced 2024-12-27 09:58:08 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Stats: compute the ranking based on the final score, not the intermediate one

Browse source
This commit is contained in:
Olivier Teulière 2012-10-05 16:49:58 +02:00
parent 553d7f9cf0
commit b53295c782
3 changed files with 14 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
game/player.cpp
View file

@ -127,6 +127,12 @@ int Player::getSoloPoints() const
}
int Player::getTotalScore() const
{
return getPoints() + getSoloPoints() + getPenaltyPoints();
}
wstring Player::toString() const
{
wstring res = L"Player ";

3
game/player.h
View file

@ -91,6 +91,9 @@ public:
/// Return the total number of solo points received
int getSoloPoints() const;
/// Return the total score of the player, including solos and penalties
int getTotalScore() const;
/**************************
* Accessors for the score of the player
**************************/

8
qt/stats_widget.cpp
View file

@ -33,6 +33,7 @@
#include "turn.h"
#include "game_params.h"
#include "settings.h"
#include "debug.h"
using namespace std;
@ -187,6 +188,7 @@ void StatsWidget::refresh()
// Final score
score += player.getSoloPoints() + player.getPenaltyPoints();
setModelText(getIndex(i + 1, col++), score, score >= gameTotal);
//ASSERT(score == player.getTotalScore(), "Invalid score computation");
// Diff with game total
setModelText(getIndex(i + 1, col++), score - gameTotal);
@ -200,9 +202,9 @@ void StatsWidget::refresh()
int rank = 1;
for (unsigned j = 0; j < nbPlayers; ++j)
{
if (i == j)
continue;
if (player.getPoints() < m_game->getPlayer(j).getPoints())
if (i == j)
continue;
if (player.getTotalScore() < m_game->getPlayer(j).getTotalScore())
++rank;
}
setModelText(getIndex(i + 1, col++), rank, rank == 1);