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

fix innapropriate name changes

Browse Source
This commit is contained in:
Fantasmos 2017-10-31 17:57:19 +11:00
parent a094a5a3d6
commit 367eeb8c20
2 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/race/race_manager.cpp
View File

@ -66,7 +66,7 @@ RaceManager::RaceManager()
{
// Several code depends on this, e.g. kart_properties
assert(DIFFICULTY_FIRST == 0);
m_default_num_karts = UserConfigParams::m_default_num_karts;
m_num_karts = UserConfigParams::m_default_num_karts;
m_difficulty = DIFFICULTY_HARD;
m_major_mode = MAJOR_MODE_SINGLE;
m_minor_mode = MINOR_MODE_NORMAL_RACE;
@ -266,16 +266,16 @@ void RaceManager::setTrack(const std::string& track)
*/
void RaceManager::computeRandomKartList()
{
int n = m_default_num_karts - (int)m_player_karts.size();
int n = m_num_karts - (int)m_player_karts.size();
if(UserConfigParams::logMisc())
Log::info("RaceManager", "AI karts count = %d for m_default_num_karts = %d and "
"m_player_karts.size() = %d", n, m_default_num_karts, m_player_karts.size());
Log::info("RaceManager", "AI karts count = %d for m_num_karts = %d and "
"m_player_karts.size() = %d", n, m_num_karts, m_player_karts.size());
// If less kart selected than there are player karts, adjust the number of
// karts to the minimum
if(n<0)
{
m_default_num_karts -= n;
m_num_karts -= n;
n = 0;
}
@ -363,20 +363,20 @@ void RaceManager::startNew(bool from_overworld)
} // if grand prix
// command line parameters: negative numbers=all karts
if(m_default_num_karts < 0 ) m_default_num_karts = stk_config->m_max_karts;
if((size_t)m_default_num_karts < m_player_karts.size())
m_default_num_karts = (int)m_player_karts.size();
if(m_num_karts < 0 ) m_num_karts = stk_config->m_max_karts;
if((size_t)m_num_karts < m_player_karts.size())
m_num_karts = (int)m_player_karts.size();
// Create the kart status data structure to keep track of scores, times, ...
// ==========================================================================
m_kart_status.clear();
if (gk > 0)
m_default_num_karts += gk;
m_num_karts += gk;
Log::verbose("RaceManager", "Nb of karts=%u, ghost karts:%u ai:%lu players:%lu\n",
(unsigned int) m_default_num_karts, gk, m_ai_kart_list.size(), m_player_karts.size());
(unsigned int) m_num_karts, gk, m_ai_kart_list.size(), m_player_karts.size());
assert((unsigned int)m_default_num_karts == gk+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());
// First add the ghost karts (if any)
// ----------------------------------------
@ -550,7 +550,7 @@ void RaceManager::startNextRace()
// The race is rerun, and the points and scores get reset ... but if
// a kart hasn't finished the race at this stage, last_score and time
// would be undefined.
for(int i=0; i<m_default_num_karts; i++)
for(int i=0; i<m_num_karts; i++)
{
m_kart_status[i].m_last_score = m_kart_status[i].m_score;
m_kart_status[i].m_last_time = 0;
@ -881,7 +881,7 @@ void RaceManager::kartFinishedRace(const AbstractKart *kart, float time)
void RaceManager::rerunRace()
{
// Subtract last score from all karts:
for(int i=0; i<m_default_num_karts; i++)
for(int i=0; i<m_num_karts; i++)
{
m_kart_status[i].m_score = m_kart_status[i].m_last_score;
m_kart_status[i].m_overall_time -= m_kart_status[i].m_last_time;
@ -956,15 +956,15 @@ void RaceManager::startWatchingReplay(const std::string &track_ident,
setNumLaps(num_laps);
setMajorMode(RaceManager::MAJOR_MODE_SINGLE);
setCoinTarget(0);
m_default_num_karts = ReplayPlay::get()->getNumGhostKart();
m_num_karts = ReplayPlay::get()->getNumGhostKart();
m_kart_status.clear();
Log::verbose("RaceManager", "%u ghost kart(s) for watching replay only\n",
(unsigned int)m_default_num_karts);
(unsigned int)m_num_karts);
int init_gp_rank = 0;
for(int i = 0; i < m_default_num_karts; i++)
for(int i = 0; i < m_num_karts; i++)
{
m_kart_status.push_back(KartStatus(ReplayPlay::get()->getGhostKartName(i),
i, -1, -1, init_gp_rank, KT_GHOST, PLAYER_DIFFICULTY_NORMAL));

8
src/race/race_manager.hpp
View File

@ -329,7 +329,7 @@ private:
int m_track_number;
GrandPrixData m_grand_prix;
SavedGrandPrix* m_saved_gp;
int m_default_num_karts;
int m_num_karts;
unsigned int m_num_spare_tire_karts;
unsigned int m_num_finished_karts;
unsigned int m_num_finished_players;
@ -469,7 +469,7 @@ public:
// ------------------------------------------------------------------------
void setNumKarts(int num)
{
m_default_num_karts = num;
m_num_karts = num;
m_ai_kart_override = "";
m_ai_superpower = SUPERPOWER_NONE;
} // setNumKarts
@ -492,7 +492,7 @@ public:
// ------------------------------------------------------------------------
/** Returns the selected number of karts (selected number of players and
* AI karts. */
unsigned int getNumberOfKarts() const {return m_default_num_karts; }
unsigned int getNumberOfKarts() const {return m_num_karts; }
// ------------------------------------------------------------------------
MajorRaceModeType getMajorMode() const { return m_major_mode; }
// ------------------------------------------------------------------------
@ -759,7 +759,7 @@ public:
m_kart_status.push_back(KartStatus(name, 0, -1, -1,
-1, KT_SPARE_TIRE, PLAYER_DIFFICULTY_NORMAL));
m_num_spare_tire_karts++;
m_default_num_karts++;
m_num_karts++;
} // addSpareTireKart
// ------------------------------------------------------------------------
void setSpareTireKartNum(unsigned int i)