ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't count ghost karts for highscores (#3416)

Browse Source 
* Add function to get the number of non-ghost karts

* remove print

* Update function call to not count ghosts

* Don't count ghost karts for highscores
This commit is contained in:
Alayan-stk-2 2018-08-30 01:50:38 +02:00 committed by auriamg
parent 8249266338
commit fb43b173d6
4 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/modes/world.cpp
View File

@ -1116,7 +1116,7 @@ Highscores* World::getHighscores() const
Highscores * highscores =
highscore_manager->getHighscores(type,
getNumKarts(),
race_manager->getNumNonGhostKarts(),
race_manager->getDifficulty(),
race_manager->getTrackName(),
race_manager->getNumLaps(),

2
src/race/highscores.cpp
View File

@ -184,7 +184,7 @@ int Highscores::addData(const std::string& kart_name,
if(position>=0)
{
m_track = race_manager->getTrackName();
m_number_of_karts = race_manager->getNumberOfKarts();
m_number_of_karts = race_manager->getNumNonGhostKarts();
m_difficulty = race_manager->getDifficulty();
m_number_of_laps = race_manager->getNumLaps();
m_reverse = race_manager->getReverseTrack();

17
src/race/race_manager.cpp
View File

@ -69,6 +69,7 @@ RaceManager::RaceManager()
// Several code depends on this, e.g. kart_properties
assert(DIFFICULTY_FIRST == 0);
m_num_karts = UserConfigParams::m_default_num_karts;
m_num_ghost_karts = 0;
m_difficulty = DIFFICULTY_HARD;
m_major_mode = MAJOR_MODE_SINGLE;
m_minor_mode = MINOR_MODE_NORMAL_RACE;
@ -321,9 +322,9 @@ void RaceManager::computeRandomKartList()
*/
void RaceManager::startNew(bool from_overworld)
{
unsigned int gk = 0;
m_num_ghost_karts = 0;
if (m_has_ghost_karts)
gk = ReplayPlay::get()->getNumGhostKart();
m_num_ghost_karts = ReplayPlay::get()->getNumGhostKart();
m_started_from_overworld = from_overworld;
m_saved_gp = NULL; // There will be checks for this being NULL done later
@ -376,21 +377,21 @@ void RaceManager::startNew(bool from_overworld)
// Create the kart status data structure to keep track of scores, times, ...
// ==========================================================================
m_kart_status.clear();
if (gk > 0)
m_num_karts += gk;
if (m_num_ghost_karts > 0)
m_num_karts += m_num_ghost_karts;
Log::verbose("RaceManager", "Nb of karts=%u, ghost karts:%u ai:%lu players:%lu\n",
(unsigned int) m_num_karts, gk, m_ai_kart_list.size(), m_player_karts.size());
(unsigned int) m_num_karts, m_num_ghost_karts, m_ai_kart_list.size(), m_player_karts.size());
assert((unsigned int)m_num_karts == gk+m_ai_kart_list.size()+m_player_karts.size());
assert((unsigned int)m_num_karts == m_num_ghost_karts+m_ai_kart_list.size()+m_player_karts.size());
// First add the ghost karts (if any)
// ----------------------------------------
// GP ranks start with -1 for the leader.
int init_gp_rank = getMinorMode()==MINOR_MODE_FOLLOW_LEADER ? -1 : 0;
if (gk > 0)
if (m_num_ghost_karts > 0)
{
for(unsigned int i = 0; i < gk; i++)
for(unsigned int i = 0; i < m_num_ghost_karts; i++)
{
m_kart_status.push_back(KartStatus(ReplayPlay::get()->getGhostKartName(i),
i, -1, -1, init_gp_rank, KT_GHOST, PLAYER_DIFFICULTY_NORMAL));

3
src/race/race_manager.hpp
View File

@ -334,6 +334,7 @@ private:
GrandPrixData m_grand_prix;
SavedGrandPrix* m_saved_gp;
int m_num_karts;
unsigned int m_num_ghost_karts;
unsigned int m_num_spare_tire_karts;
unsigned int m_num_finished_karts;
unsigned int m_num_finished_players;
@ -511,6 +512,8 @@ public:
* AI karts. */
unsigned int getNumberOfKarts() const {return m_num_karts; }
// ------------------------------------------------------------------------
unsigned int getNumNonGhostKarts() const { return m_num_karts - m_num_ghost_karts; }
// ------------------------------------------------------------------------
MajorRaceModeType getMajorMode() const { return m_major_mode; }
// ------------------------------------------------------------------------
MinorRaceModeType getMinorMode() const { return m_minor_mode; }