[loading window] Hey look, the load can be aborted now!

Also, loading messages are now in the language file.

Themes/_fallback/Languages/en.ini

@@ -1734,7 +1734,6 @@ DoubleChallengeMeter=Double Challenge Meter
 
 [StepMania]
 Announcer=Announcer
-Couldn't open any loading windows.=Couldn't open any loading windows.
 Fullscreen=Fullscreen
 Initializing %s...=Initializing %s...
 No video renderers attempted.=No video renderers attempted.
@@ -1751,6 +1750,22 @@ Windowed=Windowed
 color=color
 texture=texture
 
+[LoadingWindow]
+Couldn't open any loading windows.=Couldn't open any loading windows.
+Starting sound subsystem...=Starting sound subsystem...
+Initializing bookkeeper...=Initializing bookkeeper...
+Starting lights subsystem...=Starting lights subsystem...
+Loading game type...=Loading game type...
+Building song cache index...=Building song cache index...
+Loading banner cache...=Loading banner cache...
+Initializing memory card system...=Initializing memory card system...
+Initializing character system...=Initializing character system...
+Initializing profile system...=Initializing profile system...
+Updating popular song list...=Updating popular song list...
+Updating course rankings...=Updating course rankings...
+Initializing statics manager...=Initializing statics manager...
+Initializing message system...=Initializing message system...
+
 [StepsType]
 dance-couple=couple
 dance-double=double

src/SongManager.cpp

@@ -1,6 +1,7 @@
 #include "global.h"
 #include "SongManager.h"
 #include "arch/LoadingWindow/LoadingWindow.h"
+#include "arch/ArchHooks/ArchHooks.h"
 #include "AnnouncerManager.h"
 #include "BackgroundUtil.h"
 #include "BannerCache.h"
@@ -253,7 +254,7 @@ void SongManager::LoadStepManiaSongDir( RString sDir )
 	songCount = 0;
 	FOREACH_CONST( RString, arrayGroupDirs, s )	// foreach dir in /Songs/
 	{
-	
+		if(HOOKS->UserQuit()) break;
 		RString sGroupDirName = *s;
 		SanityCheckGroupDir(sDir+sGroupDirName);
 
@@ -291,6 +292,7 @@ void SongManager::LoadStepManiaSongDir( RString sDir )
 
 		for( unsigned j=0; j< arraySongDirs.size(); ++j )	// for each song dir
 		{
+			if(HOOKS->UserQuit()) break;
 			RString sSongDirName = arraySongDirs[j];
 
 			// this is a song directory. Load a new song.
@@ -769,6 +771,7 @@ void SongManager::InitCoursesFromDisk()
 	vector<RString> vsCourseGroupNames;
 	FOREACH_CONST( RString, vsCourseDirs, sDir )
 	{
+		if(HOOKS->UserQuit()) break;
 		// Find all group directories in Courses dir
 		GetDirListing( *sDir + "*", vsCourseGroupNames, true, true );
 		StripCvsAndSvn( vsCourseGroupNames );
@@ -781,6 +784,7 @@ void SongManager::InitCoursesFromDisk()
 
 	FOREACH_CONST( RString, vsCourseGroupNames, sCourseGroup )	// for each dir in /Courses/
 	{
+		if(HOOKS->UserQuit()) break;
 		// Find all CRS files in this group directory
 		vector<RString> vsCoursePaths;
 		GetDirListing( *sCourseGroup + "/*.crs", vsCoursePaths, false, true );
@@ -819,6 +823,7 @@ void SongManager::InitAutogenCourses()
 	Course* pCourse;
 	for( unsigned g=0; g<saGroupNames.size(); g++ )	// foreach Group
 	{
+		if(HOOKS->UserQuit()) break;
 		RString sGroupName = saGroupNames[g];
 
 		// Generate random courses from each group.
@@ -857,6 +862,7 @@ void SongManager::InitAutogenCourses()
 		vector<Song *> aSongs;
 		unsigned i = 0;
 		do {
+			if(HOOKS->UserQuit()) break;
 			RString sArtist = i >= apSongs.size()? RString(""): apSongs[i]->GetDisplayArtist();
 			RString sTranslitArtist = i >= apSongs.size()? RString(""): apSongs[i]->GetTranslitArtist();
 			if( i < apSongs.size() && !sCurArtist.CompareNoCase(sArtist) )

src/StepMania.cpp

@@ -932,7 +932,20 @@ static void ApplyLogPreferences()
 	Checkpoints::LogCheckpoints( PREFSMAN->m_bLogCheckpoints );
 }
 
-static LocalizedString COULDNT_OPEN_LOADING_WINDOW( "StepMania", "Couldn't open any loading windows." );
+static LocalizedString COULDNT_OPEN_LOADING_WINDOW( "LoadingWindow", "Couldn't open any loading windows." );
+static LocalizedString STARTING_SOUND ( "LoadingWindow", "Starting sound subsystem...");
+static LocalizedString INIT_BOOKKEEPER ( "LoadingWindow", "Initializing bookkeeper...");
+static LocalizedString START_LIGHTS ( "LoadingWindow", "Starting lights subsystem...");
+static LocalizedString LOAD_GAMETYPE ( "LoadingWindow", "Loading game type...");
+static LocalizedString BUILD_SONG_CACHE_INDEX ( "LoadingWindow", "Building song cache index...");
+static LocalizedString LOAD_BANNER_CACHE ( "LoadingWindow", "Loading banner cache...");
+static LocalizedString INIT_MEMCARD ( "LoadingWindow", "Initializing memory card system...");
+static LocalizedString INIT_CHARS ( "LoadingWindow", "Initializing character system...");
+static LocalizedString INIT_PROFILES ( "LoadingWindow", "Initializing profile system...");
+static LocalizedString UPDATE_POPULAR ( "LoadingWindow", "Updating popular song list...");
+static LocalizedString UPDATE_COURSE_RANKS ( "LoadingWindow", "Updating course rankings...");
+static LocalizedString INIT_STATICS ( "LoadingWindow", "Initializing statics manager...");
+static LocalizedString INIT_MESSAGE ( "LoadingWindow", "Initializing message system...");
 
 int main(int argc, char* argv[])
 {
@@ -1059,65 +1072,76 @@ int main(int argc, char* argv[])
 	if( PREFSMAN->m_iSoundWriteAhead )
 		LOG->Info( "Sound writeahead has been overridden to %i", PREFSMAN->m_iSoundWriteAhead.Get() );
 
-	pLoadingWindow->SetText("Starting sound subsystem...");
+	pLoadingWindow->SetText(STARTING_SOUND);
 	SOUNDMAN	= new RageSoundManager;
 	SOUNDMAN->Init();
 	SOUNDMAN->SetMixVolume();
 	SOUND		= new GameSoundManager;
-	pLoadingWindow->SetText("Initializing bookkeeper...");
+	pLoadingWindow->SetText(INIT_BOOKKEEPER);
 	BOOKKEEPER	= new Bookkeeper;
-	pLoadingWindow->SetText("Starting lights subsystem...");
+	pLoadingWindow->SetText(START_LIGHTS);
 	LIGHTSMAN	= new LightsManager;
 	INPUTFILTER	= new InputFilter;
 	INPUTMAPPER	= new InputMapper;
 
-	pLoadingWindow->SetText("Loading game type...");
+	pLoadingWindow->SetText(LOAD_GAMETYPE);
 	StepMania::ChangeCurrentGame( GAMESTATE->GetCurrentGame() );
 
 	INPUTQUEUE	= new InputQueue;
-	pLoadingWindow->SetText("Building song cache index...");
+	pLoadingWindow->SetText(BUILD_SONG_CACHE_INDEX);
 	SONGINDEX	= new SongCacheIndex;
-	pLoadingWindow->SetText("Loading banner cache...");
+	pLoadingWindow->SetText(LOAD_BANNER_CACHE);
 	BANNERCACHE	= new BannerCache;
 	//BACKGROUNDCACHE	= new BackgroundCache;
 
+#define earlyBail if( ArchHooks::UserQuit() ) { \
+		ShutdownGame(); \
+		SAFE_DELETE( pLoadingWindow ); \
+		return 0; \
+	} \
+
 	// depends on SONGINDEX:
 	SONGMAN		= new SongManager;
 	SONGMAN->InitAll();	// this takes a long time
+	earlyBail
 	CRYPTMAN	= new CryptManager;		// need to do this before ProfileMan
 	if( PREFSMAN->m_bSignProfileData )
 		CRYPTMAN->GenerateGlobalKeys();
-	pLoadingWindow->SetText("Initializing memory card system...");
+	earlyBail
+	pLoadingWindow->SetText(INIT_MEMCARD);
 	MEMCARDMAN	= new MemoryCardManager;
-	pLoadingWindow->SetText("Initializing character system...");
+	earlyBail
+	pLoadingWindow->SetText(INIT_CHARS);
+	earlyBail
 	CHARMAN		= new CharacterManager;
-	pLoadingWindow->SetText("Initializing profile system...");
+	pLoadingWindow->SetText(INIT_PROFILES);
+	earlyBail
 	PROFILEMAN	= new ProfileManager;
 	PROFILEMAN->Init();				// must load after SONGMAN
+	earlyBail
 	UNLOCKMAN	= new UnlockManager;
-	pLoadingWindow->SetText("Updating popular song list...");
+	pLoadingWindow->SetText(UPDATE_POPULAR);
+	earlyBail
 	SONGMAN->UpdatePopular();
 	SONGMAN->UpdatePreferredSort();
+	earlyBail
 
 	NSMAN 		= new NetworkSyncManager( pLoadingWindow ); 
-	pLoadingWindow->SetText("Initializing message system...");
+	pLoadingWindow->SetText(INIT_MESSAGE);
 	MESSAGEMAN	= new MessageManager;
-	pLoadingWindow->SetText("Initializing statics manager...");
+	pLoadingWindow->SetText(INIT_STATICS);
 	STATSMAN	= new StatsManager;
+	earlyBail
 
 	// Initialize which courses are ranking courses here.
-	pLoadingWindow->SetText("Updating cource rankings...");
+	pLoadingWindow->SetText(UPDATE_COURSE_RANKS);
 	SONGMAN->UpdateRankingCourses();
+	earlyBail
 
-	SAFE_DELETE( pLoadingWindow );		// destroy this before init'ing Display
+	// destroy this before init'ing Display, for now
-
+	// we will lose the rights to be focused, but that's not too important
-	/* If the user has tried to quit during the loading, do it before creating
+	// when we are going fullscreen
-	 * the main window. This prevents going to full screen just to quit. */
+	SAFE_DELETE( pLoadingWindow );
-	if( ArchHooks::UserQuit() )
-	{
-		ShutdownGame();
-		return 0;
-	}
 
 	StartDisplay();
 

src/arch/LoadingWindow/LoadingWindow_Win32.cpp

@@ -6,6 +6,7 @@
 #include "archutils/win32/WindowsResources.h"
 #include "archutils/win32/WindowIcon.h"
 #include "archutils/win32/ErrorStrings.h"
+#include "arch/ArchHooks/ArchHooks.h"
 #include <windows.h>
 #include "CommCtrl.h"
 #include "RageSurface_Load.h"
@@ -138,6 +139,7 @@ INT_PTR CALLBACK LoadingWindow_Win32::DlgProc( HWND hWnd, UINT msg, WPARAM wPara
 		break;
 
 	case WM_CLOSE:
+		HOOKS->SetUserQuit();
 		return FALSE;
 
 	case WM_DESTROY: