some menu fixes
This commit is contained in:
parent
1083d396f5
commit
8756f8f065
2
d2x.ini
2
d2x.ini
|
@ -50,7 +50,7 @@
|
||||||
Quickstart:
|
Quickstart:
|
||||||
|
|
||||||
;-ini <file> Option file (alternate to command line), defaults to d2x.ini
|
;-ini <file> Option file (alternate to command line), defaults to d2x.ini
|
||||||
;-notitles Do not show titlescreens on startup
|
;-noscreens Skip briefing screens
|
||||||
;-pilot <name> Select this pilot automatically
|
;-pilot <name> Select this pilot automatically
|
||||||
;-autodemo Start in demo mode
|
;-autodemo Start in demo mode
|
||||||
|
|
||||||
|
|
|
@ -1,5 +1,9 @@
|
||||||
D2X-Rebirth Changelog
|
D2X-Rebirth Changelog
|
||||||
|
|
||||||
|
20070303
|
||||||
|
--------
|
||||||
|
d2x.ini, main/inferno.c, main/newmenu.c: some menu fixes
|
||||||
|
|
||||||
20070228
|
20070228
|
||||||
--------
|
--------
|
||||||
main/game.c: newdemo-related fixes
|
main/game.c: newdemo-related fixes
|
||||||
|
|
|
@ -239,7 +239,7 @@ void print_commandline_help()
|
||||||
|
|
||||||
printf( "\n Quickstart:\n\n");
|
printf( "\n Quickstart:\n\n");
|
||||||
printf( " -ini <file> %s\n", "Option file (alternate to command line), defaults to d2x.ini");
|
printf( " -ini <file> %s\n", "Option file (alternate to command line), defaults to d2x.ini");
|
||||||
printf( " -notitles %s\n", "Do not show titlescreens on startup");
|
printf( " -noscreens %s\n","Skip briefing screens");
|
||||||
printf( " -pilot <name> %s\n", "Select this pilot automatically");
|
printf( " -pilot <name> %s\n", "Select this pilot automatically");
|
||||||
printf( " -autodemo %s\n", "Start in demo mode");
|
printf( " -autodemo %s\n", "Start in demo mode");
|
||||||
|
|
||||||
|
@ -271,7 +271,6 @@ void print_commandline_help()
|
||||||
#ifndef RELEASE
|
#ifndef RELEASE
|
||||||
printf( " -invulnerability %s\n","Make yourself invulnerable");
|
printf( " -invulnerability %s\n","Make yourself invulnerable");
|
||||||
printf( " -nomovies %s\n","Don't play movies");
|
printf( " -nomovies %s\n","Don't play movies");
|
||||||
printf( " -noscreens %s\n","Skip briefing screens");
|
|
||||||
#endif // RELEASE
|
#endif // RELEASE
|
||||||
#ifdef SDL_VIDEO
|
#ifdef SDL_VIDEO
|
||||||
printf( " -nosdlvidmodecheck %s\n", "Some X servers don't like checking vidmode first, so just switch");
|
printf( " -nosdlvidmodecheck %s\n", "Some X servers don't like checking vidmode first, so just switch");
|
||||||
|
@ -700,9 +699,6 @@ int main(int argc, char *argv[])
|
||||||
gr_set_mode(MovieHires?SM(640,480):SM(320,200));
|
gr_set_mode(MovieHires?SM(640,480):SM(320,200));
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
if ( FindArg( "-notitles" ) )
|
|
||||||
songs_play_song( SONG_TITLE, 1);
|
|
||||||
else
|
|
||||||
show_titles();
|
show_titles();
|
||||||
|
|
||||||
con_printf( CON_DEBUG, "\nShowing loading screen..." );
|
con_printf( CON_DEBUG, "\nShowing loading screen..." );
|
||||||
|
@ -869,7 +865,6 @@ int main(int argc, char *argv[])
|
||||||
|
|
||||||
WriteConfigFile();
|
WriteConfigFile();
|
||||||
|
|
||||||
if (!FindArg( "-notitles" ))
|
|
||||||
show_order_form();
|
show_order_form();
|
||||||
|
|
||||||
#ifndef NDEBUG
|
#ifndef NDEBUG
|
||||||
|
|
|
@ -2619,21 +2619,10 @@ int newmenu_listbox1( char * title, int nitems, char * items[], int allow_abort_
|
||||||
|
|
||||||
bg.saved = NULL;
|
bg.saved = NULL;
|
||||||
|
|
||||||
if ( (VR_offscreen_buffer->cv_w >= total_width) && (VR_offscreen_buffer->cv_h >= total_height) )
|
bg.saved = NULL;
|
||||||
bg.background = &VR_offscreen_buffer->cv_bitmap;
|
bg.background = gr_create_bitmap(grd_curcanv->cv_bitmap.bm_w, grd_curcanv->cv_bitmap.bm_h);
|
||||||
else
|
gr_bm_bitblt(grd_curcanv->cv_bitmap.bm_w, grd_curcanv->cv_bitmap.bm_h, 0, 0, 0, 0, &grd_curcanv->cv_bitmap, bg.background );
|
||||||
//bg.background = gr_create_bitmap( width, (height + title_height) );
|
nm_draw_background( wx-(15*MENSCALE_X),wy-title_height-(15*MENSCALE_Y),wx+width+(15*MENSCALE_X),wy+height+(15*MENSCALE_Y) );
|
||||||
bg.background = gr_create_bitmap(total_width,total_height);
|
|
||||||
Assert( bg.background != NULL );
|
|
||||||
|
|
||||||
//gr_bm_bitblt(wx+width+border_size, wy+height+border_size, 0, 0, wx-border_size, wy-title_height-border_size, &grd_curcanv->cv_bitmap, bg.background );
|
|
||||||
gr_bm_bitblt(total_width,total_height, 0, 0, wx-border_size, wy-title_height-border_size, &grd_curcanv->cv_bitmap, bg.background );
|
|
||||||
|
|
||||||
#if 0
|
|
||||||
gr_bm_bitblt(grd_curcanv->cv_w, grd_curcanv->cv_h, 0, 0, 0, 0, &(grd_curcanv->cv_bitmap), &(VR_offscreen_buffer->cv_bitmap) );
|
|
||||||
#endif
|
|
||||||
|
|
||||||
nm_draw_background( wx-(border_size*MENSCALE_X),wy-title_height-(border_size*MENSCALE_Y),wx+width+((border_size-1)*MENSCALE_X),wy+height+((border_size-1)*MENSCALE_Y) );
|
|
||||||
|
|
||||||
gr_string( 0x8000, wy - title_height, title );
|
gr_string( 0x8000, wy - title_height, title );
|
||||||
|
|
||||||
|
@ -2935,15 +2924,11 @@ int newmenu_listbox1( char * title, int nitems, char * items[], int allow_abort_
|
||||||
|
|
||||||
keyd_repeat = old_keyd_repeat;
|
keyd_repeat = old_keyd_repeat;
|
||||||
|
|
||||||
// gr_bm_bitblt(total_width,total_height, wx-border_size, wy-title_height-border_size, 0, 0, bg.background, &grd_curcanv->cv_bitmap );
|
gr_bm_bitblt(grd_curcanv->cv_bitmap.bm_w, grd_curcanv->cv_bitmap.bm_h, 0, 0, 0, 0, bg.background, &grd_curcanv->cv_bitmap );
|
||||||
|
|
||||||
if ( bg.background != &VR_offscreen_buffer->cv_bitmap )
|
if ( bg.background != &VR_offscreen_buffer->cv_bitmap )
|
||||||
gr_free_bitmap(bg.background);
|
gr_free_bitmap(bg.background);
|
||||||
|
|
||||||
#if 0
|
|
||||||
gr_bm_bitblt(grd_curcanv->cv_w, grd_curcanv->cv_h, 0, 0, 0, 0, &(VR_offscreen_buffer->cv_bitmap), &(grd_curcanv->cv_bitmap) );
|
|
||||||
#endif
|
|
||||||
|
|
||||||
return citem;
|
return citem;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue