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

Fixed compiler warning.

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@11959 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
hikerstk
2012-11-16 12:34:49 +00:00
parent 4cc1222681
commit e727e34b9d
1 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/tracks/track.cpp
View File

@@ -820,10 +820,12 @@ bool Track::loadMainTrack(const XMLNode &root)
bool shown = (unlock_manager->getCurrentSlot()->getPoints() < val);
m_force_fields.push_back(OverworldForceField(xyz, shown, val));
m_challenges[closest_challenge_id].setForceField(m_force_fields[m_force_fields.size() - 1]);
m_challenges[closest_challenge_id].setForceField(
m_force_fields[m_force_fields.size() - 1]);
core::stringw msg = StringUtils::toWString(val);
core::dimension2d<u32> textsize = GUIEngine::getHighresDigitFont()->getDimension(msg.c_str());
core::dimension2d<u32> textsize = GUIEngine::getHighresDigitFont()
->getDimension(msg.c_str());
scene::ISceneManager* sm = irr_driver->getSceneManager();
assert(GUIEngine::getHighresDigitFont() != NULL);
@@ -843,18 +845,19 @@ bool Track::loadMainTrack(const XMLNode &root)
}
else if (condition == "allchallenges")
{
int unlockedChallenges = 0;
unsigned int unlocked_challenges = 0;
GameSlot* slot = unlock_manager->getCurrentSlot();
for (unsigned int c=0; c<m_challenges.size(); c++)
{
if (slot->getChallenge(m_challenges[c].m_challenge_id)->isSolvedAtAnyDifficulty())
if (slot->getChallenge(m_challenges[c].m_challenge_id)
->isSolvedAtAnyDifficulty())
{
unlockedChallenges++;
unlocked_challenges++;
}
}
// allow ONE unsolved challenge : the last one
if (unlockedChallenges < m_challenges.size() - 1) continue;
if (unlocked_challenges < m_challenges.size() - 1) continue;
}
else if (condition.size() > 0)
{
@@ -869,22 +872,24 @@ bool Track::loadMainTrack(const XMLNode &root)
}
else if (neg_condition == "allchallenges")
{
int unlockedChallenges = 0;
unsigned int unlocked_challenges = 0;
GameSlot* slot = unlock_manager->getCurrentSlot();
for (unsigned int c=0; c<m_challenges.size(); c++)
{
if (slot->getChallenge(m_challenges[c].m_challenge_id)->isSolvedAtAnyDifficulty())
if (slot->getChallenge(m_challenges[c].m_challenge_id)
->isSolvedAtAnyDifficulty())
{
unlockedChallenges++;
unlocked_challenges++;
}
}
// allow ONE unsolved challenge : the last one
if (unlockedChallenges >= m_challenges.size() - 1) continue;
if (unlocked_challenges >= m_challenges.size() - 1) continue;
}
else if (neg_condition.size() > 0)
{
fprintf(stderr, "[Track] WARNING: unknown condition <%s>\n", neg_condition.c_str());
fprintf(stderr, "[Track] WARNING: unknown condition <%s>\n",
neg_condition.c_str());
}
bool tangent = false;