[loading window] Now it uses the correct instance. I hate stupid errors like this.
This commit is contained in:
@@ -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;
|
||||
|
||||
Reference in New Issue
Block a user