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

Fixed leak when winning a GP and unlocking a feature

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@10018 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
auria
2011-10-18 21:14:35 +00:00
parent 49cfd082c0
commit 0eefff60fc
2 changed files with 24 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/states_screens/grand_prix_win.cpp
View File

@@ -130,18 +130,23 @@ void GrandPrixWin::init()
img->setTabStop(false);
img->setUseAlphaChannel(true);
GUIEngine::LabelWidget* unlocked_label = new GUIEngine::LabelWidget();
unlocked_label->m_properties[GUIEngine::PROP_ID] = "label";
unlocked_label->m_properties[GUIEngine::PROP_TEXT_ALIGN] = "center";
unlocked_label->m_x = label_x_from;
unlocked_label->m_y = y_from;
unlocked_label->m_w = message_width;
unlocked_label->m_h = label_height;
unlocked_label->setText(message, false);
m_unlocked_label = new GUIEngine::LabelWidget();
m_unlocked_label->m_properties[GUIEngine::PROP_ID] = "label";
m_unlocked_label->m_properties[GUIEngine::PROP_TEXT_ALIGN] = "center";
m_unlocked_label->m_x = label_x_from;
m_unlocked_label->m_y = y_from;
m_unlocked_label->m_w = message_width;
m_unlocked_label->m_h = label_height;
m_unlocked_label->setText(message, false);
//const irr::video::SColor orange(255, 255, 126, 21);
//unlocked_label->setColor(orange);
unlocked_label->add();
m_unlocked_label->add();
manualAddWidget(m_unlocked_label);
}
else
{
m_unlocked_label = NULL;
}
m_phase = 1;
@@ -242,6 +247,13 @@ void GrandPrixWin::tearDown()
for(unsigned int i=0; i<m_all_kart_models.size(); i++)
delete m_all_kart_models[i];
m_all_kart_models.clear();
if (m_unlocked_label != NULL)
{
manualRemoveWidget(m_unlocked_label);
delete m_unlocked_label;
m_unlocked_label = NULL;
}
} // tearDown
// -------------------------------------------------------------------------------------

3
src/states_screens/grand_prix_win.hpp
View File

@@ -24,6 +24,7 @@
#include "karts/kart_model.hpp"
namespace irr { namespace scene { class ISceneNode; class ICameraSceneNode; class ILightSceneNode; class IMeshSceneNode; } }
namespace GUIEngine { class LabelWidget; }
class KartProperties;
/**
@@ -55,6 +56,8 @@ class GrandPrixWin : public GUIEngine::Screen, public GUIEngine::ScreenSingleton
irr::scene::ILightSceneNode* m_light;
GUIEngine::LabelWidget* m_unlocked_label;
int m_phase;
float m_kart_x[3], m_kart_y[3], m_kart_z[3];