From 0a301af8f6038057589cb868aae25a38b0e148a3 Mon Sep 17 00:00:00 2001 From: Bradley Bell Date: Tue, 27 Aug 2002 04:15:38 +0000 Subject: [PATCH] d1-style mission briefings --- main/titles.c | 14 ++++++++++--- main/titles.h | 58 +++++++++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 67 insertions(+), 5 deletions(-) diff --git a/main/titles.c b/main/titles.c index ef497ac7..60d4693f 100644 --- a/main/titles.c +++ b/main/titles.c @@ -1,4 +1,4 @@ -/* $Id: titles.c,v 1.11 2002-08-26 06:54:31 btb Exp $ */ +/* $Id: titles.c,v 1.12 2002-08-27 04:15:23 btb Exp $ */ /* THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX SOFTWARE CORPORATION ("PARALLAX"). PARALLAX, IN DISTRIBUTING THE CODE TO @@ -89,6 +89,10 @@ char RobotPlaying=0; #define MAX_BRIEFING_COLORS 3 +// Descent 1 briefings +char Ending_text_filename[13] = "endreg.tex"; +char Briefing_text_filename[13] = "briefing.tex"; + #define SHAREWARE_ENDING_FILENAME "ending.tex" // Can be set by -noscreens command line option. Causes bypassing of all briefing screens. @@ -546,7 +550,7 @@ int show_char_delay(char the_char, int delay, int robot_num, int cursor_flag) gr_printf(Briefing_text_x+1, Briefing_text_y, message ); WIN(DDGRUNLOCK(dd_grd_curcanv)); - gr_update(); + if (delay) gr_update(); // if (the_char != ' ') // if (!digi_is_sound_playing(SOUND_MARKER_HIT)) @@ -789,7 +793,7 @@ int show_briefing_message(int screen_num, char *message) } else if (ch=='A') { LineAdjustment=1-LineAdjustment; } else if (ch=='Z') { - mprintf ((0,"Got a Z!\n")); + //mprintf ((0,"Got a Z!\n")); GotZ=1; #if defined (D2_OEM) || defined(COMPILATION) || (defined(MACINTOSH) && defined(SHAREWARE)) DumbAdjust=1; @@ -926,6 +930,7 @@ int show_briefing_message(int screen_num, char *message) } message++; prev_ch = 10; + gr_update(); } } else if (ch == '\t') { // Tab if (Briefing_text_x - bsp->text_ulx < tab_stop) @@ -1296,6 +1301,9 @@ void do_briefing_screens(char *filename,int level_num) mprintf ((0,"Trying briefing screen! %s\n",filename)); + if (!filename) + filename = Briefing_text_filename[0]; + if (!filename) return; diff --git a/main/titles.h b/main/titles.h index de842f68..23e65cd6 100644 --- a/main/titles.h +++ b/main/titles.h @@ -1,3 +1,4 @@ +/* $Id: titles.h,v 1.2 2002-08-27 04:15:38 btb Exp $ */ /* THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX SOFTWARE CORPORATION ("PARALLAX"). PARALLAX, IN DISTRIBUTING THE CODE TO @@ -7,11 +8,60 @@ IN USING, DISPLAYING, AND CREATING DERIVATIVE WORKS THEREOF, SO LONG AS SUCH USE, DISPLAY OR CREATION IS FOR NON-COMMERCIAL, ROYALTY OR REVENUE FREE PURPOSES. IN NO EVENT SHALL THE END-USER USE THE COMPUTER CODE CONTAINED HEREIN FOR REVENUE-BEARING PURPOSES. THE END-USER UNDERSTANDS -AND AGREES TO THE TERMS HEREIN AND ACCEPTS THE SAME BY USE OF THIS FILE. +AND AGREES TO THE TERMS HEREIN AND ACCEPTS THE SAME BY USE OF THIS FILE. COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. */ - +/* + * + * . + * + * Old Log: + * Revision 2.0 1995/02/27 11:27:40 john + * New version 2.0, which has no anonymous unions, builds with + * Watcom 10.0, and doesn't require parsing BITMAPS.TBL. + * + * Revision 1.12 1995/02/02 12:23:29 john + * Made between level saves have picture. + * + * Revision 1.11 1995/01/21 16:27:11 matt + * Made endlevel briefing work with missions + * + * Revision 1.10 1995/01/20 22:48:02 matt + * Mission system implemented, though imcompletely + * + * Revision 1.9 1994/12/07 19:14:07 matt + * Kill briefing screen disable switch for release version + * + * Revision 1.8 1994/11/21 16:40:24 matt + * Added prototype + * + * Revision 1.7 1994/11/05 14:05:54 john + * Fixed fade transitions between all screens by making gr_palette_fade_in and out keep + * track of whether the palette is faded in or not. Then, wherever the code needs to fade out, + * it just calls gr_palette_fade_out and it will fade out if it isn't already. The same with fade_in. + * This eliminates the need for all the flags like Menu_fade_out, game_fade_in palette, etc. + * + * Revision 1.6 1994/11/01 17:57:48 mike + * Briefing screens. + * + * Revision 1.5 1994/10/31 22:28:04 mike + * briefing screens + * + * Revision 1.4 1994/09/16 16:14:31 john + * Added acrade sequencing. + * + * Revision 1.3 1994/06/22 00:26:53 matt + * Added support for Interplay's animating title sequence + * + * Revision 1.2 1994/06/17 12:13:36 john + * More newdemo stuff; made editor->game transition start in slew mode. + * + * Revision 1.1 1994/06/17 10:50:12 john + * Initial revision + * + * + */ #ifndef _TITLES_H #define _TITLES_H @@ -22,6 +72,10 @@ extern int Skip_briefing_screens; #define Skip_briefing_screens 0 #endif +// Descent 1 briefings +extern char Briefing_text_filename[13]; +extern char Ending_text_filename[13]; + extern int show_title_screen( char * filename, int allow_keys, int from_hog_only ); extern int show_briefing_screen( char * filename, int allow_keys ); extern void show_title_flick(char *name, int allow_keys ); -- 2.39.2