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

Fixed more bugs related to destroying the objects.

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/trunk/supertuxkart@2425 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
hikerstk 2008-11-08 04:14:42 +00:00
parent c9569c8738
commit 544424ee93
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/karts/kart_model.cpp
View File

@ -65,10 +65,11 @@ void KartModel::loadInfo(const lisp::Lisp* lisp)
*/
KartModel::~KartModel()
{
// This automatically frees the wheels and the kart model.
// m_root can be zero in case of STKConfig, which has a kart_properties
// attribute (for the default values) as well.
if(m_root) m_root->removeAllKids();
ssgDeRefDelete(m_root);
for(unsigned int i=0; i<4; i++)
if(m_wheel_model[i]) ssgDeRefDelete(m_wheel_model[i]);
} // ~KartModel
// ----------------------------------------------------------------------------

7
src/karts/kart_properties_manager.cpp
View File

@ -46,7 +46,12 @@ KartPropertiesManager::~KartPropertiesManager()
{
for(KartPropertiesVector::iterator i = m_karts_properties.begin();
i != m_karts_properties.end(); ++i)
delete *i;
{
delete *i;
// Set the entry in the kart properties vector to 0, otherwise
// memory errors happen.
m_karts_properties[i-m_karts_properties.begin()] = NULL;
}
} // ~KartPropertiesManager
//-----------------------------------------------------------------------------