actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cleanup

Browse Source
This commit is contained in:
Glenn Maynard
2006-09-21 05:04:33 +00:00
parent e0e29285fe
commit cb288fbfba
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/StepMania.cpp
+7 -7
View File
@@ -998,8 +998,8 @@ int main(int argc, char* argv[])
GAMESTATE = new GameState; GAMESTATE = new GameState;
/* This requires PREFSMAN, for PREFSMAN->m_bShowLoadingWindow. */ /* This requires PREFSMAN, for PREFSMAN->m_bShowLoadingWindow. */
LoadingWindow *loading_window = MakeLoadingWindow(); LoadingWindow *pLoadingWindow = MakeLoadingWindow();
if( loading_window == NULL ) if( pLoadingWindow == NULL )
RageException::Throw( "%s", COULDNT_OPEN_LOADING_WINDOW.GetValue().c_str() ); RageException::Throw( "%s", COULDNT_OPEN_LOADING_WINDOW.GetValue().c_str() );
srand( time(NULL) ); // seed number generator srand( time(NULL) ); // seed number generator
@@ -1030,7 +1030,7 @@ int main(int argc, char* argv[])
RString sError; RString sError;
RageSurface *pIcon = RageSurfaceUtils::LoadFile( THEME->GetPathG( "Common", "window icon" ), sError ); RageSurface *pIcon = RageSurfaceUtils::LoadFile( THEME->GetPathG( "Common", "window icon" ), sError );
if( pIcon ) if( pIcon )
loading_window->SetIcon( pIcon ); pLoadingWindow->SetIcon( pIcon );
delete pIcon; delete pIcon;
} }
@@ -1052,7 +1052,7 @@ int main(int argc, char* argv[])
/* depends on SONGINDEX: */ /* depends on SONGINDEX: */
SONGMAN = new SongManager(); SONGMAN = new SongManager();
if( !GetCommandlineArgument("ExportNsisStrings") && !GetCommandlineArgument("ExportLuaInformation") ) if( !GetCommandlineArgument("ExportNsisStrings") && !GetCommandlineArgument("ExportLuaInformation") )
SONGMAN->InitAll( loading_window ); // this takes a long time SONGMAN->InitAll( pLoadingWindow ); // this takes a long time
CRYPTMAN = new CryptManager; // need to do this before ProfileMan CRYPTMAN = new CryptManager; // need to do this before ProfileMan
MEMCARDMAN = new MemoryCardManager; MEMCARDMAN = new MemoryCardManager;
CHARMAN = new CharacterManager; CHARMAN = new CharacterManager;
@@ -1064,13 +1064,13 @@ int main(int argc, char* argv[])
/* This shouldn't need to be here; if it's taking long enough that this is /* This shouldn't need to be here; if it's taking long enough that this is
* even visible, we should be fixing it, not showing a progress display. */ * even visible, we should be fixing it, not showing a progress display. */
CatalogXml::Save( loading_window ); CatalogXml::Save( pLoadingWindow );
NSMAN = new NetworkSyncManager( loading_window ); NSMAN = new NetworkSyncManager( pLoadingWindow );
MESSAGEMAN = new MessageManager; MESSAGEMAN = new MessageManager;
STATSMAN = new StatsManager; STATSMAN = new StatsManager;
SAFE_DELETE( loading_window ); // destroy this before init'ing Display SAFE_DELETE( pLoadingWindow ); // destroy this before init'ing Display
StartDisplay(); StartDisplay();