From b4e3da2a4185fd93a366b166724657ee0bb8bd40 Mon Sep 17 00:00:00 2001 From: Bradley Bell Date: Mon, 8 Dec 2014 18:27:02 -0800 Subject: [PATCH] minor stuff --- main/movie.c | 20 ++------------------ main/movie.h | 3 +-- 2 files changed, 3 insertions(+), 20 deletions(-) diff --git a/main/movie.c b/main/movie.c index 0d7ccc3b..a24dd9c0 100644 --- a/main/movie.c +++ b/main/movie.c @@ -1,4 +1,3 @@ -/* $Id: movie.c,v 1.40 2006-02-26 02:29:06 chris Exp $ */ /* THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX SOFTWARE CORPORATION ("PARALLAX"). PARALLAX, IN DISTRIBUTING THE CODE TO @@ -22,10 +21,6 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include #endif -#ifdef RCS -static char rcsid[] = "$Id: movie.c,v 1.40 2006-02-26 02:29:06 chris Exp $"; -#endif - #include #ifndef macintosh # ifndef _WIN32_WCE @@ -63,11 +58,6 @@ static char rcsid[] = "$Id: movie.c,v 1.40 2006-02-26 02:29:06 chris Exp $"; extern int MenuHiresAvailable; extern char CDROM_dir[]; -#define VID_PLAY 0 -#define VID_PAUSE 1 - -int Vid_State; - // Subtitle data typedef struct { @@ -309,6 +299,8 @@ int RunMovie(char *filename, int hires_flag, int must_have,int dx,int dy) MVE_memCallbacks(MPlayAlloc, MPlayFree); MVE_ioCallbacks(FileRead); + MVE_sfCallbacks(MovieShowFrame); + MVE_palCallbacks(MovieSetPalette); if (hires_flag) { gr_set_mode(SM(640,480)); @@ -322,17 +314,11 @@ int RunMovie(char *filename, int hires_flag, int must_have,int dx,int dy) gr_palette_load(gr_palette); #endif - MVE_sfCallbacks(MovieShowFrame); - MVE_palCallbacks(MovieSetPalette); - if (MVE_rmPrepMovie((void *)filehndl, dx, dy, track)) { Int3(); return MOVIE_NOT_PLAYED; } - MVE_sfCallbacks(MovieShowFrame); - MVE_palCallbacks(MovieSetPalette); - frame_num = 0; FontHires = FontHiresAvailable && hires_flag; @@ -455,8 +441,6 @@ int InitRobotMovie(char *filename) return MOVIE_NOT_PLAYED; } - Vid_State = VID_PLAY; - if (MVE_rmPrepMovie((void *)RoboFile, MenuHires?280:140, MenuHires?200:80, 0)) { Int3(); return 0; diff --git a/main/movie.h b/main/movie.h index c6177a4c..2a56a455 100644 --- a/main/movie.h +++ b/main/movie.h @@ -1,4 +1,3 @@ -/* $Id: movie.h,v 1.3 2003-10-10 09:36:35 btb Exp $ */ /* THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX SOFTWARE CORPORATION ("PARALLAX"). PARALLAX, IN DISTRIBUTING THE CODE TO @@ -26,7 +25,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #define MOVIE_NOT_PLAYED 0 // movie wasn't present #define MOVIE_PLAYED_FULL 1 // movie was played all the way through -#define MOVIE_ABORTED 2 // movie started by was aborted +#define MOVIE_ABORTED 2 // movie started but was aborted extern int PlayMovie(const char *filename, int allow_abort); extern int PlayMovies(int num_files, const char *filename[], int graphmode, int allow_abort); -- 2.39.2