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

minor cleanup

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@4155 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
auria 2009-10-28 22:27:11 +00:00
parent 1c198f22ad
commit fa7152b188
5 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/challenges/unlock_manager.cpp
View File

@ -263,9 +263,11 @@ void UnlockManager::computeActive()
{
fprintf(stderr,"Challenge prerequisite '%s' of '%s' not found - ignored\n",
pre->c_str(), i->first.c_str());
continue;
//continue;
allSolved=false;
break;
}
if(!p->isSolved())
else if(!p->isSolved())
{
allSolved=false;
break;

2
src/guiengine/abstract_state_manager.cpp
View File

@ -103,8 +103,6 @@ void AbstractStateManager::pushScreen(Screen* screen)
void AbstractStateManager::replaceTopMostScreen(Screen* screen)
{
assert(m_game_mode != GAME);
// FIXME : handle cutscenes ?
std::string name = screen->getName();

2
src/guiengine/widgets/dynamic_ribbon_widget.cpp
View File

@ -56,7 +56,7 @@ void DynamicRibbonWidget::add()
//printf("****DynamicRibbonWidget::add()****\n");
m_has_label = (m_text == "bottom");
m_label_height = m_has_label ? 25 : 0; // FIXME : get height from font, don't hardcode
m_label_height = m_has_label ? 25 : 0; // FIXME : get height from font, don't hardcode (what if label is multiline?)
// ----- add dynamic label at bottom
if (m_has_label)

4
src/states_screens/kart_selection.cpp
View File

@ -662,7 +662,7 @@ void KartSelectionScreen::init()
std::string icon_path = file_manager->getDataDir() ;
icon_path += "/karts/" + prop->getIdent() + "/" + prop->getIconFile();
w->addItem(prop->getName(), prop->getIdent().c_str(), icon_path.c_str());
std::cout << "Add item : " << prop->getIdent().c_str() << std::endl;
//std::cout << "Add item : " << prop->getIdent().c_str() << std::endl;
break;
}
}
@ -676,7 +676,7 @@ void KartSelectionScreen::init()
std::string icon_path = file_manager->getDataDir() ;
icon_path += "/karts/" + prop->getIdent() + "/" + prop->getIconFile();
w->addItem(prop->getName(), prop->getIdent().c_str(), icon_path.c_str());
std::cout << "Add item : " << prop->getIdent().c_str() << std::endl;
//std::cout << "Add item : " << prop->getIdent().c_str() << std::endl;
}
}

2
src/tracks/track.cpp
View File

@ -192,7 +192,7 @@ void Track::loadTrackInfo(const std::string &filename)
m_default_ambient_color = video::SColor(255, 120, 120, 120);
m_sun_ambient_color = video::SColor(255, 120, 120, 120);
m_sun_specular_color = video::SColor(255, 255, 255, 255);
m_sun_diffuse_color = video::SColor(255, 255, 255, 255);
m_sun_diffuse_color = video::SColor(128, 128, 128, 128);
XMLNode *root = file_manager->createXMLTree(m_filename);
if(!root || root->getName()!="track")