[loading window] Whoops. Merge.

Themes/_fallback/Languages/en.ini

@@ -1657,6 +1657,8 @@ Error adding file '%s'.=Error adding file '%s'.
 Loading courses...=Loading courses...
 Loading songs...=Loading songs...
 Reloading...=Reloading...
+Unloading songs...=Unloading songs...
+Unloading courses...=Unloading courses...
 The folder "%s" appears to be a song folder.  All song folders must reside in a group folder.  For example, "Songs/Originals/My Song".=The folder "%s" appears to be a song folder. All song folders must reside in a group folder. For example, "Songs/Originals/My Song" will contain the music file (MP3, OGG...), the steps file (.sm, .dwi, .ksf...) and other related files.
 
 [SongUtil]

src/RageThreads.cpp

@@ -322,6 +322,17 @@ int RageThread::Wait()
 	return ret;
 }
 
+void RageThread::Halt(bool Kill) {
+	ASSERT( m_pSlot != NULL );
+	ASSERT( m_pSlot->m_pImpl != NULL );
+	m_pSlot->m_pImpl->Halt(Kill);
+}
+
+void RageThread::Resume() {
+	ASSERT( m_pSlot != NULL );
+	ASSERT( m_pSlot->m_pImpl != NULL );
+	m_pSlot->m_pImpl->Resume();
+}
 
 void RageThread::HaltAllThreads( bool Kill )
 {

src/RageThreads.h

@@ -15,6 +15,9 @@ public:
 	RString GetName() const { return m_sName; }
 	void Create( int (*fn)(void *), void *data );
 
+	void Halt( bool Kill=false);
+	void Resume();
+
 	/* For crash handlers: kill or suspend all threads (except for
 	 * the running one) immediately. */ 
 	static void HaltAllThreads( bool Kill=false );

src/SongManager.cpp

@@ -98,6 +98,8 @@ void SongManager::InitAll()
 }
 
 static LocalizedString RELOADING ( "SongManager", "Reloading..." );
+static LocalizedString UNLOADING_SONGS ( "SongManager", "Unloading songs..." );
+static LocalizedString UNLOADING_COURSES ( "SongManager", "Unloading courses..." );
 void SongManager::Reload( bool bAllowFastLoad )
 {
 	FILEMAN->FlushDirCache( SpecialFiles::SONGS_DIR );
@@ -112,7 +114,13 @@ void SongManager::Reload( bool bAllowFastLoad )
 	// save scores before unloading songs, of the scores will be lost
 	PROFILEMAN->SaveMachineProfile();
 
+	if( pLoadingWindow )
+		pLoadingWindow->SetText( UNLOADING_COURSES );
+
 	FreeCourses();
+
+	if( pLoadingWindow )
+		pLoadingWindow->SetText( UNLOADING_SONGS );
 	FreeSongs();
 
 	const bool OldVal = PREFSMAN->m_bFastLoad;

src/StepMania-net2010.vcxproj

@@ -76,7 +76,7 @@
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='FastDebug|Win32'">$(TargetDir)</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='FastDebug|Win32'">$(SolutionDir)/build-$(SolutionName)/$(ProjectName)/$(Configuration)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='FastDebug|Win32'">false</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='FastDebug|Win32'">true</LinkIncremental>
     <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='FastDebug|Win32'">true</GenerateManifest>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Release-SSE2|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release-SSE2|Win32'">$(Configuration)\</IntDir>
@@ -268,7 +268,7 @@ cl /Zl /nologo /c verstub.cpp /Fo$(IntDir)</Command>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <DisableSpecificWarnings>4063;4100;4127;4201;4244;4275;4355;4505;4512;4702;4786;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-      <WholeProgramOptimization>true</WholeProgramOptimization>
+      <WholeProgramOptimization>false</WholeProgramOptimization>
       <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
@@ -295,7 +295,7 @@ cl /Zl /nologo /c verstub.cpp /Fo$(IntDir)</Command>
       <DataExecutionPrevention>
       </DataExecutionPrevention>
       <LinkErrorReporting>SendErrorReport</LinkErrorReporting>
-      <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
+      <LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>
     </Link>
     <PostBuildEvent>
       <Command>archutils\Win32\mapconv "$(IntDir)$(TargetName).map" "$(TargetDir)\StepMania-fastdebug.vdi"</Command>
@@ -371,6 +371,7 @@ cl /Zl /nologo /c verstub.cpp /Fo$(IntDir)</Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemGroup>
+    <ClCompile Include="InGameLoadingWindow.cpp" />
     <ClCompile Include="Screen.cpp" />
     <ClCompile Include="ScreenAttract.cpp" />
     <ClCompile Include="ScreenBookkeeping.cpp" />
@@ -1689,6 +1690,7 @@ cl /Zl /nologo /c verstub.cpp /Fo$(IntDir)</Command>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
+    <ClInclude Include="InGameLoadingWindow.h" />
     <ClInclude Include="Screen.h" />
     <ClInclude Include="ScreenAttract.h" />
     <ClInclude Include="ScreenBookkeeping.h" />