From 98ed2dd98cee9beb28e4405818f34069f4ee599c Mon Sep 17 00:00:00 2001 From: Bradley Bell Date: Tue, 18 Feb 2003 23:30:44 +0000 Subject: [PATCH] make sure movie's palette is set before writing briefing text. Fixes bug #359 --- main/movie.h | 1 + main/titles.c | 6 ++---- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/main/movie.h b/main/movie.h index 8005f388..ace5c79d 100644 --- a/main/movie.h +++ b/main/movie.h @@ -27,6 +27,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. extern int PlayMovie(const char *filename, int allow_abort); extern int PlayMovies(int num_files, const char *filename[], int graphmode, int allow_abort); extern int InitRobotMovie (char *filename); +extern int RotateRobot(); extern void DeInitRobotMovie(void); //find and initialize the movie libraries diff --git a/main/titles.c b/main/titles.c index 484da97a..512d8058 100644 --- a/main/titles.c +++ b/main/titles.c @@ -1,4 +1,4 @@ -/* $Id: titles.c,v 1.18 2003-02-18 07:05:14 btb Exp $ */ +/* $Id: titles.c,v 1.19 2003-02-18 23:30:44 btb Exp $ */ /* THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX SOFTWARE CORPORATION ("PARALLAX"). PARALLAX, IN DISTRIBUTING THE CODE TO @@ -66,9 +66,6 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "poly_acc.h" #endif -#ifdef ROBOT_MOVIES -extern void RotateRobot(); -#endif void DoBriefingColorStuff (); int get_new_message_num(char **message); @@ -1013,6 +1010,7 @@ int show_briefing_message(int screen_num, char *message) // gr_remap_bitmap_good( &grd_curcanv->cv_bitmap, pal, -1, -1 ); if (RobotPlaying) { + RotateRobot(); DoBriefingColorStuff (); mprintf ((0,"Robot playing is %d!!!",RobotPlaying)); } -- 2.39.2