From cbe9fb41fb1ad153b68bf966909bfcc2bcf5887d Mon Sep 17 00:00:00 2001
From: Bradley Bell <btb@icculus.org>
Date: Tue, 23 Jul 2002 21:24:11 +0000
Subject: [PATCH] remove experimental nmovie stuff

---
 configure.ac    |  9 ---------
 main/endlevel.c | 15 ++++++++-------
 main/endlevel.h |  5 ++---
 main/menu.c     | 11 ++---------
 main/sounds.h   |  3 ++-
 5 files changed, 14 insertions(+), 29 deletions(-)

diff --git a/configure.ac b/configure.ac
index 6018925d..9bc9d93b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -94,15 +94,6 @@ if test x$enable_shareware = xyes; then
 fi
 AM_CONDITIONAL(SHAREWARE, test x$enable_shareware = xyes)
 
-dnl Enable NMOVIES?
-AC_ARG_ENABLE(nmovies,
-  [  --enable-nmovies        Turn off movies (render extra sequences) (experimental)],,)
-if test x$enable_nmovies = xyes; then
-    AC_DEFINE(NMOVIES,,[Define to render some extra sequences (instead of movies)])
-    D2X_FEATURES="nmovies ${D2X_FEATURES}"
-fi
-AM_CONDITIONAL(NMOVIES, test x$enable_nmovies = xyes)
-
 dnl Build with NDEBUG?
 AC_ARG_ENABLE(debug,
   [  --disable-debug         Take out debug symbols, Asserts, Int3, etc ],,)
diff --git a/main/endlevel.c b/main/endlevel.c
index badd953c..a141200c 100644
--- a/main/endlevel.c
+++ b/main/endlevel.c
@@ -1,3 +1,4 @@
+/* $ Id: $ */
 /*
 THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX
 SOFTWARE CORPORATION ("PARALLAX").  PARALLAX, IN DISTRIBUTING THE CODE TO
@@ -16,7 +17,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #endif
 
 #ifdef RCS
-static char rcsid[] = "$Id: endlevel.c,v 1.5 2001-11-09 06:54:23 bradleyb Exp $";
+static char rcsid[] = "$Id: endlevel.c,v 1.6 2002-07-23 21:24:11 btb Exp $";
 #endif
 
 //#define SLEW_ON 1
@@ -226,7 +227,7 @@ int start_endlevel_movie()
 
 	memcpy(save_pal,gr_palette,768);
 
-	#if !defined(SHAREWARE) && !defined (NMOVIES)
+	#ifndef SHAREWARE
 		r=PlayMovie(movie_name,(Game_mode & GM_MULTI)?0:MOVIE_REQUIRED);
 	#else
 		return	0;	// movie not played for shareware
@@ -352,7 +353,7 @@ void start_endlevel_sequence()
 		if (!(Game_mode & GM_MULTI))
 			movie_played = start_endlevel_movie();
 		
-		#if defined(SHAREWARE) || defined(NMOVIES)
+		#ifdef SHAREWARE
 		if (movie_played == MOVIE_NOT_PLAYED) {		//don't have movie.  Do rendered sequence
 		#ifndef WINDOWS
 			start_rendered_endlevel_sequence();
@@ -368,7 +369,7 @@ void start_endlevel_sequence()
 	PlayerFinishedLevel(0);		//done with level
 }
 
-#if !defined(SHAREWARE) && !defined(NMOVIES)
+#ifndef SHAREWARE
 
 void do_endlevel_frame() {Int3();}
 void stop_endlevel_sequence() {Int3();}
@@ -572,7 +573,7 @@ void get_angs_to_object(vms_angvec *av,vms_vector *targ_pos,vms_vector *cur_pos)
 
 void do_endlevel_frame()
 {
-	#if defined(SHAREWARE) || defined(NMOVIES)
+	#ifdef SHAREWARE
 	static fix timer;
 	static fix bank_rate;
 	#endif
@@ -713,7 +714,7 @@ void do_endlevel_frame()
 
 			if (ConsoleObject->segnum == transition_segnum) {
 
-				#if !defined(SHAREWARE) && !defined(NMOVIES)
+				#ifndef SHAREWARE
 					start_endlevel_movie();
 					stop_endlevel_sequence();
 				#else
@@ -754,7 +755,7 @@ void do_endlevel_frame()
 		}
 
 
-#if defined(SHAREWARE) || defined(NMOVIES)
+#ifdef SHAREWARE
 		case EL_LOOKBACK: {
 
 			do_endlevel_flythrough(0);
diff --git a/main/endlevel.h b/main/endlevel.h
index 1baf0423..10d6fa2d 100644
--- a/main/endlevel.h
+++ b/main/endlevel.h
@@ -1,3 +1,4 @@
+/* $ Id: $ */
 /*
 THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX
 SOFTWARE CORPORATION ("PARALLAX").  PARALLAX, IN DISTRIBUTING THE CODE TO
@@ -11,8 +12,6 @@ AND AGREES TO THE TERMS HEREIN AND ACCEPTS THE SAME BY USE OF THIS FILE.
 COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 */
 
-
-
 #ifndef _OUTSIDE_H
 #define _OUTSIDE_H
 
@@ -24,7 +23,7 @@ void stop_endlevel_sequence();
 void start_endlevel_sequence();
 void render_endlevel_frame(fix eye_offset);
 
-#if defined(SHAREWARE) || defined(NMOVIES)
+#ifdef SHAREWARE
 
 void render_external_scene();
 void draw_exit_model();
diff --git a/main/menu.c b/main/menu.c
index ae0f9b77..462d3ec1 100644
--- a/main/menu.c
+++ b/main/menu.c
@@ -1,3 +1,4 @@
+/* $ Id: $ */
 /*
 THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX
 SOFTWARE CORPORATION ("PARALLAX").  PARALLAX, IN DISTRIBUTING THE CODE TO
@@ -12,17 +13,9 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 */
 
 /*
- * $Source: /cvs/cvsroot/d2x/main/menu.c,v $
- * $Revision: 1.8 $
- * $Author: bradleyb $
- * $Date: 2002-07-16 08:14:35 $
  *
  * Inferno main menu.
  *
- * $Log: not supported by cvs2svn $
- * Revision 1.7  2002/02/13 10:39:21  bradleyb
- * Lotsa networking stuff from d1x
- *
  *
  */
 
@@ -238,7 +231,7 @@ try_again:;
 
 			if ((d_rand() % (n_demos+1)) == 0)
 			{
-				#if !defined(SHAREWARE) && !defined(NMOVIES)
+				#ifndef SHAREWARE
 					#ifdef WINDOWS
 					mouse_set_mode(1);				//re-enable centering mode
 					HideCursorW();
diff --git a/main/sounds.h b/main/sounds.h
index f39d58fd..925ce413 100644
--- a/main/sounds.h
+++ b/main/sounds.h
@@ -1,3 +1,4 @@
+/* $ Id: $ */
 /*
 THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX
 SOFTWARE CORPORATION ("PARALLAX").  PARALLAX, IN DISTRIBUTING THE CODE TO
@@ -102,7 +103,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #define	ROBOT_ATTACK_SOUND_DEFAULT					171
 #define	ROBOT_CLAW_SOUND_DEFAULT					190
 
-#if defined(SHAREWARE) || defined(NMOVIES)
+#ifdef SHAREWARE
 #define 	SOUND_BIG_ENDLEVEL_EXPLOSION				SOUND_EXPLODING_WALL
 #define 	SOUND_TUNNEL_EXPLOSION						SOUND_EXPLODING_WALL
 #endif
-- 
2.39.2