Do not try loading missing videos.

KJeff01 · KJeff01 · commit 81bf12847181 · 2017-09-06T17:49:46.000-05:00
Patch by forum member Forgon.
Fixes ticket:4631.
diff --git a/src/frontend.cpp b/src/frontend.cpp
@@ -145,6 +145,7 @@ static bool startTitleMenu()
 	addTextButton(FRONTEND_MULTIPLAYER, FRONTEND_POS3X, FRONTEND_POS3Y, _("Multi Player"), WBUT_TXTCENTRE);
 	addTextButton(FRONTEND_TUTORIAL, FRONTEND_POS4X, FRONTEND_POS4Y, _("Tutorial"), WBUT_TXTCENTRE);
 	addTextButton(FRONTEND_OPTIONS, FRONTEND_POS5X, FRONTEND_POS5Y, _("Options"), WBUT_TXTCENTRE);
+	// check whether video sequences are installed
 	if (PHYSFS_exists("sequences/devastation.ogg"))
 	{
 		addTextButton(FRONTEND_PLAYINTRO, FRONTEND_POS6X, FRONTEND_POS6Y, _("View Intro"), WBUT_TXTCENTRE);
@@ -397,11 +398,15 @@ static void frontEndNewGame(int which)
 {
 	QList<CAMPAIGN_FILE> list = readCampaignFiles();
 	sstrcpy(aLevelName, list[which].level.toUtf8().constData());
-	if (!list[which].video.isEmpty())
+	// show this only when the video sequences are installed
+	if (PHYSFS_exists("sequences/devastation.ogg"))
 	{
-		seq_ClearSeqList();
-		seq_AddSeqToList(list[which].video.toUtf8().constData(), nullptr, list[which].captions.toUtf8().constData(), false);
-		seq_StartNextFullScreenVideo();
+		if (!list[which].video.isEmpty())
+		{
+			seq_ClearSeqList();
+			seq_AddSeqToList(list[which].video.toUtf8().constData(), nullptr, list[which].captions.toUtf8().constData(), false);
+			seq_StartNextFullScreenVideo();
+		}
 	}
 	if (!list[which].package.isEmpty())
 	{
diff --git a/src/intelmap.cpp b/src/intelmap.cpp
@@ -368,7 +368,7 @@ static bool intAddMessageForm(bool playCurrent)
 	return true;
 }
 
-/*Add the 3D world view for the particular message (only research nmessages now) */
+/*Add the 3D world view for the particular message */
 bool intAddMessageView(MESSAGE *psMessage)
 {
 	bool			Animate = true;
@@ -476,20 +476,23 @@ bool intAddMessageView(MESSAGE *psMessage)
 		return false;
 	}
 
-	/*Add the Flic box */
-	sFormInit = W_FORMINIT();
-	sFormInit.formID = IDINTMAP_MSGVIEW;
-	sFormInit.id = IDINTMAP_FLICVIEW;
-	sFormInit.style = WFORM_PLAIN;
-	sFormInit.x = INTMAP_FLICX;
-	sFormInit.y = INTMAP_FLICY;
-	sFormInit.width = INTMAP_FLICWIDTH;
-	sFormInit.height = INTMAP_FLICHEIGHT;
-	sFormInit.pDisplay = intDisplayFLICView;
-	sFormInit.pUserData = psMessage;
-	if (!widgAddForm(psWScreen, &sFormInit))
+	/*Add the Flic box if videos are installed */
+	if (PHYSFS_exists("sequences/devastation.ogg"))
 	{
-		return false;
+		sFormInit = W_FORMINIT();
+		sFormInit.formID = IDINTMAP_MSGVIEW;
+		sFormInit.id = IDINTMAP_FLICVIEW;
+		sFormInit.style = WFORM_PLAIN;
+		sFormInit.x = INTMAP_FLICX;
+		sFormInit.y = INTMAP_FLICY;
+		sFormInit.width = INTMAP_FLICWIDTH;
+		sFormInit.height = INTMAP_FLICHEIGHT;
+		sFormInit.pDisplay = intDisplayFLICView;
+		sFormInit.pUserData = psMessage;
+		if (!widgAddForm(psWScreen, &sFormInit))
+		{
+			return false;
+		}
 	}
 
 	/*Add the text box*/
@@ -738,15 +741,18 @@ void intIntelButtonPressed(bool proxMsg, UDWORD id)
 
 		if (psMessage->pViewData)
 		{
-			// If its a video sequence then play it anyway
+			// If it's a video sequence then play it anyway
 			if (psMessage->pViewData->type == VIEW_RPL)
 			{
 				if (psMessage->pViewData)
 				{
 					intAddMessageView(psMessage);
 				}
-
-				StartMessageSequences(psMessage, true);
+				// only attempt to show videos if they are installed
+				if (PHYSFS_exists("sequences/devastation.ogg"))
+				{
+					StartMessageSequences(psMessage, true);
+				}
 			}
 			else if (psMessage->pViewData->type == VIEW_RES)
 			{
@@ -1223,8 +1229,12 @@ void displayImmediateMessage(MESSAGE *psMessage)
 		This has to be changed to support a script calling a message in the intelligence screen
 	*/
 
-	psCurrentMsg = psMessage;
-	StartMessageSequences(psMessage, true);
+	// only attempt to show videos if they are installed
+	if (PHYSFS_exists("sequences/devastation.ogg"))
+	{
+	    psCurrentMsg = psMessage;
+	    StartMessageSequences(psMessage, true);
+	}
 	// remind the player that the message can be seen again from
 	// the intelligence screen
 	addConsoleMessage(_("New Intelligence Report"), CENTRE_JUSTIFY, SYSTEM_MESSAGE);

Original file line number	Diff line number	Diff line change
`@@ -145,6 +145,7 @@ static bool startTitleMenu()`
`145`	`145`	`addTextButton(FRONTEND_MULTIPLAYER, FRONTEND_POS3X, FRONTEND_POS3Y, _("Multi Player"), WBUT_TXTCENTRE);`
`146`	`146`	`addTextButton(FRONTEND_TUTORIAL, FRONTEND_POS4X, FRONTEND_POS4Y, _("Tutorial"), WBUT_TXTCENTRE);`
`147`	`147`	`addTextButton(FRONTEND_OPTIONS, FRONTEND_POS5X, FRONTEND_POS5Y, _("Options"), WBUT_TXTCENTRE);`
	`148`	`+ // check whether video sequences are installed`
`148`	`149`	`if (PHYSFS_exists("sequences/devastation.ogg"))`
`149`	`150`	`{`
`150`	`151`	`addTextButton(FRONTEND_PLAYINTRO, FRONTEND_POS6X, FRONTEND_POS6Y, _("View Intro"), WBUT_TXTCENTRE);`
`@@ -397,11 +398,15 @@ static void frontEndNewGame(int which)`
`397`	`398`	`{`
`398`	`399`	`QList<CAMPAIGN_FILE> list = readCampaignFiles();`
`399`	`400`	`sstrcpy(aLevelName, list[which].level.toUtf8().constData());`
`400`		`- if (!list[which].video.isEmpty())`
	`401`	`+ // show this only when the video sequences are installed`
	`402`	`+ if (PHYSFS_exists("sequences/devastation.ogg"))`
`401`	`403`	`{`
`402`		`- seq_ClearSeqList();`
`403`		`- seq_AddSeqToList(list[which].video.toUtf8().constData(), nullptr, list[which].captions.toUtf8().constData(), false);`
`404`		`- seq_StartNextFullScreenVideo();`
	`404`	`+ if (!list[which].video.isEmpty())`
	`405`	`+ {`
	`406`	`+ seq_ClearSeqList();`
	`407`	`+ seq_AddSeqToList(list[which].video.toUtf8().constData(), nullptr, list[which].captions.toUtf8().constData(), false);`
	`408`	`+ seq_StartNextFullScreenVideo();`
	`409`	`+ }`
`405`	`410`	`}`
`406`	`411`	`if (!list[which].package.isEmpty())`
`407`	`412`	`{`