[loading window] Now it uses the correct instance. I hate stupid errors like this.

This commit is contained in:
Henrik Andersson
2011-06-05 12:24:04 +02:00
parent 167cd9238a
commit 1679709981
2 changed files with 6 additions and 14 deletions
+6 -13
View File
@@ -21,11 +21,11 @@ void ScreenReloadSongs::Init()
loadWin=new InGameLoadingWindow( );
loadWin->SetXY( SCREEN_CENTER_X, SCREEN_CENTER_Y );
AddChild( loadWin );
pLoadingWindow = new InGameLoadingWindow( );
loadWin->SetXY( SCREEN_CENTER_X, SCREEN_CENTER_Y );
pLoadingWindow=loadWin;
m_loadingThread.SetName("Song reload work thread");
m_loadingThread.Create(loadingThreadProc,this);
@@ -33,18 +33,11 @@ void ScreenReloadSongs::Init()
ScreenReloadSongs::~ScreenReloadSongs()
{
delete pLoadingWindow;
//m_loadingThread.Halt(true);
RemoveChild(loadWin);
delete loadWin;
}
void ScreenReloadSongs::Update( float fDeltaTime ) {
Screen::Update( fDeltaTime );
//SCREENMAN->Draw();
}
int ScreenReloadSongs::loadingThreadProc(void *thisAsVoidPtr) {
ScreenReloadSongs *self=(ScreenReloadSongs *)thisAsVoidPtr;
-1
View File
@@ -11,7 +11,6 @@ class ScreenReloadSongs: public Screen
public:
virtual void Init();
~ScreenReloadSongs();
void Update( float fDeltaTime );
private:
InGameLoadingWindow *loadWin;
RageThread m_loadingThread;