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

For more consistency to original game, show descent(b).pcx before pilot selection if available; Generally use PATH_MAX for filename arrays in titles code

Browse source
This commit is contained in:
zicodxx 2011-01-16 11:39:46 +01:00
parent e5fc130b82
commit a4e07c142b
2 changed files with 13 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.txt
View file

@ -4,6 +4,7 @@ D2X-Rebirth Changelog
--------
2d/bitblt.c, arch/ogl/gr.c, arch/ogl/ogl.c, include/ogl_init.h, main/menu.c: Added feature to enable Anisotropic filtering is supported by hardware or driver; Reworked way of handling texture filtering information so ingame switching is possible again
main/menu.c: When changing resolutions and Game_wind is present, send EVENT_WINDOW_ACTIVATE shortly so it's canvase will align to the new resolution seamlessly
main/titles.c: For more consistency to original game, show descent(b).pcx before pilot selection if available; Generally use PATH_MAX for filename arrays in titles code
20110115
--------

22
main/titles.c
View file

@ -143,7 +143,7 @@ int show_title_screen( char * filename, int allow_keys, int from_hog_only )
title_screen *ts;
window *wind;
int pcx_error;
char new_filename[FILENAME_LEN+1] = "";
char new_filename[PATH_MAX] = "";
MALLOC(ts, title_screen, 1);
if (!ts)
@ -187,14 +187,13 @@ int intro_played = 0;
void show_titles(void)
{
char filename[PATH_MAX];
int played=MOVIE_NOT_PLAYED; //default is not played
int song_playing = 0;
#define MOVIE_REQUIRED 1 //(!is_D2_OEM && !is_SHAREWARE && !is_MAC_SHARE) // causes segfault
{ //show bundler screens
char filename[FILENAME_LEN];
played=MOVIE_NOT_PLAYED; //default is not played
played = PlayMovie("pre_i.mve",0);
@ -223,8 +222,6 @@ void show_titles(void)
if (played == MOVIE_NOT_PLAYED)
{
char filename[FILENAME_LEN];
con_printf( CON_DEBUG, "\nPlaying title song..." );
songs_play_song( SONG_TITLE, 1);
song_playing = 1;
@ -249,8 +246,6 @@ void show_titles(void)
}
{ //show bundler movie or screens
char filename[FILENAME_LEN];
PHYSFS_file *movie_handle;
played=MOVIE_NOT_PLAYED; //default is not played
@ -277,13 +272,20 @@ void show_titles(void)
}
if (!song_playing)
{
con_printf( CON_DEBUG, "\nPlaying title song..." );
songs_play_song( SONG_TITLE, 1);
}
con_printf( CON_DEBUG, "\nShowing logo screen..." );
strcpy(filename, HIRESMODE?"descentb.pcx":"descent.pcx");
if (cfexist(filename))
show_title_screen(filename, 1, 1);
}
void show_order_form()
{
#ifndef EDITOR
char exit_screen[16];
char exit_screen[PATH_MAX];
key_flush();
@ -305,7 +307,7 @@ void show_order_form()
//-----------------------------------------------------------------------------
typedef struct {
char bs_name[16]; // filename, eg merc01. Assumes .lbm suffix.
char bs_name[PATH_MAX]; // filename, eg merc01. Assumes .lbm suffix.
sbyte level_num;
sbyte message_num;
short text_ulx, text_uly; // upper left x,y of text window
@ -396,7 +398,7 @@ typedef struct briefing
short cur_screen;
briefing_screen *screen;
grs_bitmap background;
char background_name[16];
char background_name[PATH_MAX];
int got_z;
int hum_channel, printing_channel;
char *text;