- fixed: Strife's in-level slideshow had the wrong music.

- fixed: Sounds played on an intermission page must be stopped when the page is destroyed.


SVN r2899 (finale)

src/intermission/intermission.cpp

@@ -218,6 +218,7 @@ void DIntermissionScreen::Destroy()
 		mPaletteChanged = false;
 		M_EnableMenu(true);
 	}
+	S_StopSound(CHAN_VOICE);
 	Super::Destroy();
 }
 
@@ -740,6 +741,7 @@ void DIntermissionController::Ticker ()
 				wipegamestate = GS_LEVEL;
 				P_ResumeConversation ();
 				viewactive = true;
+				Destroy();
 				break;
 
 			case FSTATE_ChangingLevel:
@@ -765,6 +767,7 @@ void DIntermissionController::Drawer ()
 void DIntermissionController::Destroy ()
 {
 	Super::Destroy();
+	if (mScreen != NULL) mScreen->Destroy();
 	if (mDeleteDesc) delete mDesc;
 	mDesc = NULL;
 	if (CurrentIntermission == this) CurrentIntermission = NULL;

wadsrc/static/mapinfo/strife.txt

@@ -174,7 +174,7 @@ Intermission Inter_Strife_MAP03
 {
 	Image
 	{
-		Music = "D_FAST"
+		Music = "D_DARK"
 		Background = "SS2F1"
 		Sound = "svox/mac10"
 		Time = 9
@@ -203,7 +203,7 @@ Intermission Inter_Strife_MAP10
 {
 	Image
 	{
-		Music = "D_FAST"
+		Music = "D_DARK"
 		Background = "SS3F1"
 		Sound = "svox/mac16"
 		Time = 10