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

Fixed crash when locked kart was select by random

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@7697 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
auria
2011-02-13 21:03:39 +00:00
parent 6a1fe7ec60
commit 2149fd0cb9
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/states_screens/kart_selection.cpp
View File

@@ -53,6 +53,7 @@ using irr::core::stringw;
const char* RANDOM_KART_ID = "randomkart";
const char* ALL_KART_GROUPS_ID = "all";
const char* ID_DONT_USE = "x";
const char* ID_LOCKED = "locked";
DEFINE_SCREEN_SINGLETON( KartSelectionScreen );
@@ -787,7 +788,7 @@ public:
w3->update(0);
m_parent->m_kart_widgets[playerID].m_kart_name->setText( _("Random Kart") );
}
else if (selectionID == "locked")
else if (selectionID == ID_LOCKED)
{
w3->clearModels();
w3->addModel(irr_driver->getAnimatedMesh( file_manager->getDataDir() + "/models/chest.b3d" )->getMesh(20),
@@ -1271,7 +1272,7 @@ void KartSelectionScreen::playerConfirm(const int playerID)
DynamicRibbonWidget* w = getWidget<DynamicRibbonWidget>("karts");
assert(w != NULL);
const std::string selection = w->getSelectionIDString(playerID);
if (selection == "locked")
if (selection == ID_LOCKED)
{
unlock_manager->playLockSound();
return;
@@ -1486,16 +1487,19 @@ void KartSelectionScreen::allPlayersDone()
{
// don't select an already selected kart
int randomID;
int count = 0; // to prevent infinite loop in case they are all locked
bool done = false;
do
{
randomID = random.get(item_count);
if (items[randomID].m_code_name != ID_DONT_USE)
if (items[randomID].m_code_name != ID_DONT_USE && items[randomID].m_code_name != ID_LOCKED)
{
selected_kart_group = items[randomID].m_code_name;
done = true;
}
items[randomID].m_code_name = ID_DONT_USE;
count++;
if (count > 100) return;
} while (!done);
}
else
@@ -1709,7 +1713,7 @@ void KartSelectionScreen::setKartsFromCurrentGroup()
{
w->addItem(
_("Locked : solve active challenges to gain access to more!"),
"locked", prop->getAbsoluteIconFile(), LOCKED_BADGE);
ID_LOCKED, prop->getAbsoluteIconFile(), LOCKED_BADGE);
}
else
{
@@ -1735,7 +1739,7 @@ void KartSelectionScreen::setKartsFromCurrentGroup()
{
w->addItem(
_("Locked : solve active challenges to gain access to more!"),
"locked", icon_path, LOCKED_BADGE,
ID_LOCKED, icon_path, LOCKED_BADGE,
IconButtonWidget::ICON_PATH_TYPE_ABSOLUTE);
}
else