1) Bugfix: World::Karts was protected (causing a compilation error on

linux)
2) Removed several warning (e.g. no newline at end of file).


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/trunk/supertuxkart@2288 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
hikerstk
2008-09-21 06:04:38 +00:00
parent 67c514f1ed
commit 1738961f68
5 changed files with 10 additions and 8 deletions

View File

@@ -38,4 +38,4 @@ public:
};
#endif
#endif

View File

@@ -79,4 +79,4 @@ void StandardRace::update(float delta)
void StandardRace::onTerminate()
{
World::terminateRace();
}
}

View File

@@ -36,4 +36,4 @@ public:
virtual void restartRace();
};
#endif
#endif

View File

@@ -159,6 +159,8 @@ void Clock::updateClock(const float dt)
case FINISH_PHASE:
m_listener->onTerminate();
return;
default: //RACE_PHASE, LIMBO_PHASEL nothing to do, but avoid a warning
break;
}
switch(m_mode)
@@ -256,8 +258,8 @@ World::World()
{
// In profile mode, load only the old kart
newkart = new DefaultRobot(kart_name, position, init_pos);
// Create a camera for the last kart (since this way more of the
// karts can be seen.
// Create a camera for the last kart (since this way more of the
// karts can be seen.
if(i==race_manager->getNumKarts()-1)
{
scene->createCamera(local_player_id, newkart);
@@ -398,7 +400,7 @@ void World::resetAllKarts()
if(!material)
{
fprintf(stderr, "ERROR: no valid starting position for kart %d on track %s.\n",
(int)(i-m_kart.begin()), m_track->getIdent().c_str());
(int)(i-m_kart.begin()), m_track->getIdent().c_str());
exit(-1);
}
all_finished=false;

View File

@@ -194,9 +194,9 @@ public:
class World
{
protected:
public:
typedef std::vector<Kart*> Karts;
protected:
std::vector<PlayerKart*> m_player_karts;
std::vector<PlayerKart*> m_local_player_karts;
std::vector<NetworkKart*> m_network_karts;