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

Removed need to call drv_init when using --list-karts. This

Browse Source 
1) avoids opening of the STK window
2) removes problem with drv_deinit not being called (resulting potentially
   in wrong screen resolutions when STK finishes)
and is faster (based on a patch by Paul Elms).


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/trunk/supertuxkart@1290 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
hikerstk 2007-11-12 03:17:52 +00:00
parent a8c2de27cb
commit f16dcff123
5 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/kart_properties.cpp
View File

@ -45,7 +45,8 @@ KartProperties::KartProperties() : m_icon_material(0), m_model(0)
{} // KartProperties
//-----------------------------------------------------------------------------
void KartProperties::load(const std::string filename, const std::string node)
void KartProperties::load(const std::string filename, const std::string node,
bool dont_load_models)
{
init_defaults();
@ -79,8 +80,8 @@ void KartProperties::load(const std::string filename, const std::string node)
// Load material
m_icon_material = material_manager->getMaterial(m_icon_file);
// Load model
if(m_model_file.length()>0)
// Load model, except when called as part of --list-karts
if(m_model_file.length()>0 && !dont_load_models)
{
m_model = loader->load(m_model_file, CB_KART, false);
ssgStripify(m_model);

3
src/kart_properties.hpp
View File

@ -106,7 +106,8 @@ public:
virtual void init_defaults ();
virtual void getAllData (const lisp::Lisp* lisp);
virtual void load (const std::string filename,
const std::string node="tuxkart-kart");
const std::string node="tuxkart-kart",
bool dont_load_models=false);
Material* getIconMaterial () const {return m_icon_material; }
ssgEntity* getModel () const {return m_model; }

6
src/kart_properties_manager.cpp
View File

@ -55,13 +55,13 @@ void KartPropertiesManager::removeTextures()
} // removeTextures
//-----------------------------------------------------------------------------
void KartPropertiesManager::loadKartData()
void KartPropertiesManager::loadKartData(bool dont_load_models)
{
m_max_steer_angle = -1.0f;
std::set<std::string> result;
loader->listFiles(result, "data");
// Findout which characters are available and load them
// Find out which characters are available and load them
for(std::set<std::string>::iterator i = result.begin();
i != result.end(); ++i)
{
@ -69,7 +69,7 @@ void KartPropertiesManager::loadKartData()
{
KartProperties* kp = new KartProperties();
std::string tmp= std::string("data")+DIR_SEPARATOR + *i;
kp->load(tmp.c_str());
kp->load(tmp.c_str(), "tuxkart-kart", dont_load_models);
m_karts_properties.push_back(kp);
if(kp->getMaxSteerAngle() > m_max_steer_angle)
{

2
src/kart_properties_manager.hpp
View File

@ -40,7 +40,7 @@ public:
const KartProperties* getKartById (int i);
const KartProperties* getKart (const std::string IDENT);
const int getKartId (const std::string IDENT);
void loadKartData ();
void loadKartData (bool dont_load_models=false);
const float getMaximumSteeringAngle() {return m_max_steer_angle;}
const unsigned int getNumberOfKarts () {return m_karts_properties.size();}

5
src/main.cpp
View File

@ -197,9 +197,8 @@ int handleCmdLine(int argc, char **argv)
}
else if( !strcmp(argv[i], "--list-karts") )
{
// --list-karts seems to need a drv_init() ???
drv_init();
kart_properties_manager->loadKartData () ;
bool dont_load_models=true;
kart_properties_manager->loadKartData(dont_load_models) ;
fprintf ( stdout, _(" Available karts:\n") );
for (unsigned int i = 0; NULL != kart_properties_manager->getKartById(i); i++)