TakeV/dxx-rebirth
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

fix bug: when opening d1 level 1 with oem data files, both d1 and d2 oem briefing where showed

Browse source
This commit is contained in:
Bradley Bell 2003-03-22 01:38:54 +00:00
parent def93f6be3
commit ae33dd9ed8
2 changed files with 12 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
ChangeLog
View file

@ -1,5 +1,8 @@
2003-03-21 Martin Schaffner <maschaffner@gmx.ch> 2003-03-21 Martin Schaffner <maschaffner@gmx.ch>
* fix bug: when opening d1 level 1 with oem data files, both d1
and d2 oem briefing where showed
* main/inferno.c, main/movie.c: Change the default movie * main/inferno.c, main/movie.c: Change the default movie
resolution to "high", implement the option -lowresmovies resolution to "high", implement the option -lowresmovies

24
main/gameseq.c
View file

@ -1,4 +1,4 @@
/* $Id: gameseq.c,v 1.20 2003-03-20 22:50:50 btb Exp $ */ /* $Id: gameseq.c,v 1.21 2003-03-22 01:38:54 btb Exp $ */
/* /*
THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX
SOFTWARE CORPORATION ("PARALLAX"). PARALLAX, IN DISTRIBUTING THE CODE TO SOFTWARE CORPORATION ("PARALLAX"). PARALLAX, IN DISTRIBUTING THE CODE TO
@ -17,7 +17,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED.
#endif #endif
#ifdef RCS #ifdef RCS
char gameseq_rcsid[] = "$Id: gameseq.c,v 1.20 2003-03-20 22:50:50 btb Exp $"; char gameseq_rcsid[] = "$Id: gameseq.c,v 1.21 2003-03-22 01:38:54 btb Exp $";
#endif #endif
#ifdef WINDOWS #ifdef WINDOWS
@ -2244,27 +2244,21 @@ void ShowLevelIntro(int level_num)
//if shareware, show a briefing? //if shareware, show a briefing?
if (!(Game_mode & GM_MULTI)) { if (!(Game_mode & GM_MULTI)) {
#ifndef SHAREWARE
int i; int i;
#endif
ubyte save_pal[sizeof(gr_palette)]; ubyte save_pal[sizeof(gr_palette)];
memcpy(save_pal,gr_palette,sizeof(gr_palette)); memcpy(save_pal,gr_palette,sizeof(gr_palette));
if (level_num == 1 && !intro_played) {
// try to play d2 oem briefing
do_briefing_screens("brief2o.tex", 1);
}
if (Current_mission_num == Builtin_mission_num) { if (Current_mission_num == Builtin_mission_num) {
#ifndef SHAREWARE
int movie=0; int movie=0;
#endif
if (cfexist("brief2.txb") || cfexist("brief2.tex")) { // #ifdef SHAREWARE if (cfexist("brief2.txb") || cfexist("brief2.tex")) { // SHAREWARE
if (level_num==1) if (level_num==1)
{ do_briefing_screens ("brief2.tex", 1);
do_briefing_screens ("brief2.tex",1); } else if (cfexist("brief2o.txb") || cfexist("brief2o.tex")) { // OEM
} if (level_num == 1 && !intro_played)
do_briefing_screens("brief2o.tex", 1);
} else { // full version } else { // full version
for (i=0;i<NUM_INTRO_MOVIES;i++) for (i=0;i<NUM_INTRO_MOVIES;i++)
{ {