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

Decide smarter who won and who lost in a GP, depending on number of players

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@5730 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
auria 2010-08-08 01:02:26 +00:00
parent 35d2456800
commit 9dfa90beed
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/race/race_manager.cpp
View File

@ -20,6 +20,7 @@
#include "race/race_manager.hpp" #include "race/race_manager.hpp"
#include <iostream> #include <iostream>
#include <algorithm>
#include "challenges/unlock_manager.hpp" #include "challenges/unlock_manager.hpp"
#include "config/user_config.hpp" #include "config/user_config.hpp"
@ -417,18 +418,24 @@ void RaceManager::exitRace()
bool someHumanPlayerWon = false; bool someHumanPlayerWon = false;
const unsigned int kartStatusCount = m_kart_status.size(); const unsigned int kartStatusCount = m_kart_status.size();
/** The rank from which players are considered losers - you are behind half the players OR
behind the first 3 (the first condition handles cases where there are 3 karts or less).
However this rank may not be 0, since at least one player must win, hence the std::max call. */
const int loserThreshold = std::max(1, std::min(3, int(kartStatusCount)/2));
std::string winners[3]; std::string winners[3];
std::vector<std::string> humanLosers; // because we don't care about AIs that lost std::vector<std::string> humanLosers; // because we don't care about AIs that lost
for (unsigned int i=0; i < kartStatusCount; ++i) for (unsigned int i=0; i < kartStatusCount; ++i)
{ {
if(UserConfigParams::m_verbosity>=5) if(UserConfigParams::m_verbosity >= 5)
{ {
std::cout << m_kart_status[i].m_ident << " has GP final rank " std::cout << m_kart_status[i].m_ident << " has GP final rank "
<< m_kart_status[i].m_gp_rank << std::endl; << m_kart_status[i].m_gp_rank << std::endl;
} }
const int rank = m_kart_status[i].m_gp_rank; const int rank = m_kart_status[i].m_gp_rank;
if (rank >= 0 && rank < 3) if (rank >= 0 && rank < loserThreshold)
{ {
winners[rank] = m_kart_status[i].m_ident; winners[rank] = m_kart_status[i].m_ident;
if (m_kart_status[i].m_kart_type == KT_PLAYER || if (m_kart_status[i].m_kart_type == KT_PLAYER ||
@ -437,7 +444,7 @@ void RaceManager::exitRace()
someHumanPlayerWon = true; someHumanPlayerWon = true;
} }
} }
else if (rank >= 3) else if (rank >= loserThreshold)
{ {
if (m_kart_status[i].m_kart_type == KT_PLAYER || if (m_kart_status[i].m_kart_type == KT_PLAYER ||
m_kart_status[i].m_kart_type == KT_NETWORK_PLAYER) m_kart_status[i].m_kart_type == KT_NETWORK_PLAYER)