From 3da2cee8142533adf3d642a53bbd1d820d62f166 Mon Sep 17 00:00:00 2001
From: Bradley Bell <btb@icculus.org>
Date: Mon, 24 Feb 2003 07:03:47 +0000
Subject: [PATCH] fixed crash when using shareware data files without -nohires

---
 ChangeLog    | 2 ++
 main/movie.c | 7 +++++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 5729fbd7..5d3776fd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2003-02-23  Bradley Bell <btb@icculus.org>
 
+	* main/movie.c: fixed crash when using shareware data files
+	without -nohires
 	* arch/sdl/digi.c: fix crash on non-existent sounds
 	(i.e. shareware data)
 
diff --git a/main/movie.c b/main/movie.c
index 84e4a135..dd7d1b2c 100644
--- a/main/movie.c
+++ b/main/movie.c
@@ -1,4 +1,4 @@
-/* $Id: movie.c,v 1.19 2003-02-19 03:09:38 btb Exp $ */
+/* $Id: movie.c,v 1.20 2003-02-24 07:03:47 btb Exp $ */
 /*
 THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX
 SOFTWARE CORPORATION ("PARALLAX").  PARALLAX, IN DISTRIBUTING THE CODE TO
@@ -17,7 +17,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #endif
 
 #ifdef RCS
-static char rcsid[] = "$Id: movie.c,v 1.19 2003-02-19 03:09:38 btb Exp $";
+static char rcsid[] = "$Id: movie.c,v 1.20 2003-02-24 07:03:47 btb Exp $";
 #endif
 
 #define DEBUG_LEVEL CON_NORMAL
@@ -313,6 +313,9 @@ int RunMovie(char *filename, int hires_flag, int must_have,int dx,int dy)
 
 int InitMovieBriefing()
 {
+	if (!robot_movies)
+		return 0;
+
 	if (MenuHires)
 		gr_set_mode(SM(640,480));
 	else
-- 
2.39.2