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

Fixed crash (when some things are actually locked).

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12663 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
hikerstk 2013-04-15 23:01:44 +00:00
parent 10317fe33c
commit 9773df37ee
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/challenges/challenge_data.hpp
View File

@ -181,6 +181,9 @@ public:
/** Returns if this challenge is a grand prix. */
bool isGrandPrix() const { return m_mode == CM_GRAND_PRIX; }
// ------------------------------------------------------------------------
/** Returns if this challenge is a grand prix. */
bool isSingleRace() const { return m_mode == CM_SINGLE_RACE; }
// ------------------------------------------------------------------------
/** Returns the challenge mode of this challenge. */
ChallengeModeType getMode() const { return m_mode; }
// ------------------------------------------------------------------------

9
src/challenges/game_slot.cpp
View File

@ -127,10 +127,15 @@ void GameSlot::computeActive()
{
if (m_points < i->second->getData()->getNumTrophies())
{
if (i->second->getData()->getTrackId().size() > 0)
if (i->second->getData()->isSingleRace())
m_locked_features[i->second->getData()->getTrackId()] = true;
else if (i->second->getData()->getGPId().size() > 0)
else if (i->second->getData()->isGrandPrix())
m_locked_features[i->second->getData()->getGPId()] = true;
else
{
// FIXME when more challenge types are implemented.
assert(false);
}
}
}