From e9662ed636bf96040cd0bb96b344e2c55088982c Mon Sep 17 00:00:00 2001
From: Bradley Bell <btb@icculus.org>
Date: Fri, 21 Feb 2003 07:14:32 +0000
Subject: [PATCH] fixed up endlevel stuff

---
 ChangeLog       |  1 +
 main/bm.c       | 12 ++++++++----
 main/bm.h       |  2 +-
 main/endlevel.c | 43 +++++++++++++++++++++++--------------------
 4 files changed, 33 insertions(+), 25 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 8b840dc1..246a537d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,6 @@
 2003-02-20  Bradley Bell <btb@icculus.org>
 
+	* main/bm.c, main/bm.h, main/endlevel.c: fixed up endlevel stuff
 	* arch/sdl/digi.c, main/kludge.c: oops, meant to say: fixed bug
 	#343, not "rest of solution to bug #344"
 	* arch/sdl/timer.c, include/timer.h: revert to more accurate
diff --git a/main/bm.c b/main/bm.c
index 1b57372c..de7f9cd8 100644
--- a/main/bm.c
+++ b/main/bm.c
@@ -1,4 +1,4 @@
-/* $Id: bm.c,v 1.20 2003-01-02 23:13:21 btb Exp $ */
+/* $Id: bm.c,v 1.21 2003-02-21 07:14:32 btb Exp $ */
 /*
 THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX
 SOFTWARE CORPORATION ("PARALLAX").  PARALLAX, IN DISTRIBUTING THE CODE TO
@@ -185,7 +185,7 @@ free_exit_model_data()
 void ogl_cache_polymodel_textures(int model_num);
 #endif
 
-void load_exit_models()
+int load_exit_models()
 {
 	CFILE *exit_hamfile;
 	int start_num;
@@ -195,7 +195,7 @@ void load_exit_models()
 	    !cfexist("rbot062.bbm") ||
 	    !cfexist("rbot063.bbm")) {
 		Warning("Can't load exit models!\n");
-		return;
+		return 0;
 	}
 
 	start_num = N_ObjBitmaps;
@@ -238,8 +238,12 @@ void load_exit_models()
 		ogl_cache_polymodel_textures(destroyed_exit_modelnum);
 #endif
 
-	} else
+	} else {
 		Warning("Can't load exit models!\n");
+		return 0;
+	}
+
+	return 1;
 }
 
 
diff --git a/main/bm.h b/main/bm.h
index 095e0b96..177f48cd 100644
--- a/main/bm.h
+++ b/main/bm.h
@@ -95,7 +95,7 @@ int bm_init_use_tbl(void);
 
 extern void bm_read_all(CFILE * fp);
 
-void load_exit_models();
+int load_exit_models();
 void free_exit_model_data();
 
 #endif
diff --git a/main/endlevel.c b/main/endlevel.c
index e8ca540c..0f9f29a3 100644
--- a/main/endlevel.c
+++ b/main/endlevel.c
@@ -17,7 +17,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #endif
 
 #ifdef RCS
-static char rcsid[] = "$Id: endlevel.c,v 1.10 2002-09-14 00:20:44 btb Exp $";
+static char rcsid[] = "$Id: endlevel.c,v 1.11 2003-02-21 07:14:32 btb Exp $";
 #endif
 
 //#define SLEW_ON 1
@@ -205,7 +205,7 @@ int start_endlevel_movie()
 	int r;
 	ubyte save_pal[768];
 
-	//Assert(Current_mission_num == 0);		//only play movie for built-in mission
+	//Assert(Current_mission_num == Builtin_mission_num);   //only play movie for built-in mission
 
 	//Assert(N_MOVIES >= Last_level);
 	//Assert(N_MOVIES_SECRET >= -Last_secret_level);
@@ -307,16 +307,18 @@ void start_endlevel_sequence()
 	int movie_played = MOVIE_NOT_PLAYED;
 	static int inited = 0;
 
-	if (!inited && Piggy_hamfile_version >= 3) {
-		load_exit_models();
-		inited = 1;
+	if (!inited) {
+		if (Piggy_hamfile_version >= 3)
+			inited = load_exit_models();
+		else
+			inited = 1;
 	}
 
 	if (Newdemo_state == ND_STATE_RECORDING)		// stop demo recording
 		Newdemo_state = ND_STATE_PAUSED;
 
 	if (Newdemo_state == ND_STATE_PLAYBACK) {		// don't do this if in playback mode
-		if (Current_mission_num == 0)		//only play movie for built-in mission
+		if (Current_mission_num == Builtin_mission_num) //only play movie for built-in mission
 			start_endlevel_movie();
 		strcpy(last_palette_loaded,"");		//force palette load next time
 		return;
@@ -344,23 +346,22 @@ void start_endlevel_sequence()
 	}
 #endif
 
-	if (1) { //Current_mission_num == 0) {		//only play movie for built-in mission
-
-		//try playing movie.  If it plays, great. if not, do rendered ending
-
+	if (Current_mission_num == Builtin_mission_num) {
+		// only play movie for built-in mission
 		if (!(Game_mode & GM_MULTI))
 			movie_played = start_endlevel_movie();
+	}
 
-		if (movie_played == MOVIE_NOT_PLAYED) {		//don't have movie.  Do rendered sequence
-		#ifndef WINDOWS
-			start_rendered_endlevel_sequence();
-		#endif
-			return;
-		}
-
+	if (inited && endlevel_data_loaded && (movie_played == MOVIE_NOT_PLAYED)) {
+		//don't have movie.  Do rendered sequence, if available
+#ifndef WINDOWS
+		start_rendered_endlevel_sequence();
+#endif
+		return;
 	}
-	else
-		gr_palette_fade_out(gr_palette, 32, 0);
+
+	//don't have movie or rendered sequence, fade out
+	gr_palette_fade_out(gr_palette, 32, 0);
 
 	PlayerFinishedLevel(0);		//done with level
 }
@@ -700,7 +701,8 @@ void do_endlevel_frame()
 
 			if (ConsoleObject->segnum == transition_segnum) {
 
-				if (start_endlevel_movie() != MOVIE_NOT_PLAYED)
+				if ((Current_mission_num == Builtin_mission_num) &&
+					(start_endlevel_movie() != MOVIE_NOT_PLAYED))
 					stop_endlevel_sequence();
 				else {
 					int objnum;
@@ -1488,6 +1490,7 @@ try_again:
 		if (!ifile) {
 			if (level_num==1) {
 				con_printf(CON_DEBUG, "Cannot load file text of binary version of <%s>\n",filename);
+				endlevel_data_loaded = 0;
 				return;
 			}
 			else {
-- 
2.39.2