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

Renamed RaceManager::getKartName to getKartIdent, since this is was the function actually does :)

Browse Source 
(prevents us printing the id instead of the name somewhere).


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@3846 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
hikerstk 2009-08-13 04:53:51 +00:00
parent 3c7e489698
commit 2b5a273b95
3 changed files with 10 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/modes/world.cpp
View File

@ -109,13 +109,13 @@ void World::init()
int position = i+1; // position start with 1 int position = i+1; // position start with 1
btTransform init_pos=m_track->getStartTransform(i); btTransform init_pos=m_track->getStartTransform(i);
Kart* newkart; Kart* newkart;
const std::string& kart_name = race_manager->getKartName(i); const std::string& kart_ident = race_manager->getKartIdent(i);
int local_player_id = race_manager->getKartLocalPlayerId(i); int local_player_id = race_manager->getKartLocalPlayerId(i);
int global_player_id = race_manager->getKartGlobalPlayerId(i); int global_player_id = race_manager->getKartGlobalPlayerId(i);
if(UserConfigParams::m_profile) if(UserConfigParams::m_profile)
{ {
// In profile mode, load only the old kart // In profile mode, load only the old kart
newkart = new DefaultRobot(kart_name, position, init_pos, m_track); newkart = new DefaultRobot(kart_ident, position, init_pos, m_track);
// Create a camera for the last kart (since this way more of the // Create a camera for the last kart (since this way more of the
// karts can be seen. // karts can be seen.
if(i==race_manager->getNumKarts()-1) if(i==race_manager->getNumKarts()-1)
@ -130,14 +130,14 @@ void World::init()
{ {
case RaceManager::KT_PLAYER: case RaceManager::KT_PLAYER:
std::cout << "===== World : creating player kart for kart #" << i << " which has local_player_id " << local_player_id << " ===========\n"; std::cout << "===== World : creating player kart for kart #" << i << " which has local_player_id " << local_player_id << " ===========\n";
newkart = new PlayerKart(kart_name, position, newkart = new PlayerKart(kart_ident, position,
StateManager::get()->getActivePlayer(local_player_id), StateManager::get()->getActivePlayer(local_player_id),
init_pos, local_player_id); init_pos, local_player_id);
m_player_karts[global_player_id] = (PlayerKart*)newkart; m_player_karts[global_player_id] = (PlayerKart*)newkart;
m_local_player_karts[local_player_id] = static_cast<PlayerKart*>(newkart); m_local_player_karts[local_player_id] = static_cast<PlayerKart*>(newkart);
break; break;
case RaceManager::KT_NETWORK_PLAYER: case RaceManager::KT_NETWORK_PLAYER:
newkart = new NetworkKart(kart_name, position, init_pos, newkart = new NetworkKart(kart_ident, position, init_pos,
global_player_id); global_player_id);
m_network_karts[global_player_id] = static_cast<NetworkKart*>(newkart); m_network_karts[global_player_id] = static_cast<NetworkKart*>(newkart);
m_player_karts[global_player_id] = (PlayerKart*)newkart; m_player_karts[global_player_id] = (PlayerKart*)newkart;
@ -145,7 +145,7 @@ void World::init()
case RaceManager::KT_AI: case RaceManager::KT_AI:
std::cout << "===== World : creating AI kart for #" << i << "===========\n"; std::cout << "===== World : creating AI kart for #" << i << "===========\n";
newkart = loadRobot(kart_name, position, init_pos); newkart = loadRobot(kart_ident, position, init_pos);
break; break;
case RaceManager::KT_GHOST: case RaceManager::KT_GHOST:
break; break;
@ -172,8 +172,6 @@ void World::init()
World::~World() World::~World()
{ {
delete m_race_gui; delete m_race_gui;
item_manager->cleanup();
delete race_state; delete race_state;
// In case that a race is aborted (e.g. track not found) m_track is 0. // In case that a race is aborted (e.g. track not found) m_track is 0.
if(m_track) if(m_track)
@ -443,9 +441,6 @@ void World::removeKart(int kart_number)
*/ */
void World::loadTrack() void World::loadTrack()
{ {
// remove old items (from previous race), and remove old
// track specific item models
item_manager->cleanup();
if(race_manager->getMajorMode()== RaceManager::MAJOR_MODE_GRAND_PRIX) if(race_manager->getMajorMode()== RaceManager::MAJOR_MODE_GRAND_PRIX)
{ {
try try

2
src/race/race_manager.hpp
View File

@ -201,7 +201,7 @@ public:
const { return m_kart_status[kart_id].m_gp_final_rank; } const { return m_kart_status[kart_id].m_gp_final_rank; }
const std::string& const std::string&
getKartName(int kart) const { return m_kart_status[kart].m_ident;} getKartIdent(int kart) const { return m_kart_status[kart].m_ident;}
int getKartScore(int krt) const { return m_kart_status[krt].m_score; } int getKartScore(int krt) const { return m_kart_status[krt].m_score; }
int getKartPrevScore(int krt)const { return m_kart_status[krt].m_last_score;} int getKartPrevScore(int krt)const { return m_kart_status[krt].m_last_score;}
int getKartLocalPlayerId(int k) int getKartLocalPlayerId(int k)

4
src/states_screens/race_gui.cpp
View File

@ -88,8 +88,8 @@ void RaceGUI::createMarkerTexture()
#endif #endif
for(unsigned int i=0; i<race_manager->getNumKarts(); i++) for(unsigned int i=0; i<race_manager->getNumKarts(); i++)
{ {
const std::string& kart_name = race_manager->getKartName(i); const std::string& kart_ident = race_manager->getKartIdent(i);
const KartProperties *kp = kart_properties_manager->getKart(kart_name); const KartProperties *kp = kart_properties_manager->getKart(kart_ident);
core::vector2df center((float)((m_marker_rendered_size>>1)+i*m_marker_rendered_size), core::vector2df center((float)((m_marker_rendered_size>>1)+i*m_marker_rendered_size),
(float)(m_marker_rendered_size>>1) ); (float)(m_marker_rendered_size>>1) );
int count = kp->getShape(); int count = kp->getShape();