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

update viewing values at Fullscreen Toggle; added Fullscreen Toggle to Menus and Demo Playback

Browse source
This commit is contained in:
zicodxx 2007-05-09 09:44:45 +00:00
parent 9c7b97dfe7
commit d758d1bda6
4 changed files with 35 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
CHANGELOG.txt
View file

@ -1,5 +1,9 @@
D2X-Rebirth Changelog
20070509
--------
arch/ogl/gr.c, main/gamecntl.c, main/newmenu.c: update viewing values at Fullscreen Toggle; added Fullscreen Toggle to Menus and Demo Playback
20070506
--------
main/titles.c: removed unnecessary gr_set_mode() call causing annoying resolution change (hopefully)

12
arch/ogl/gr.c
View file

@ -88,6 +88,18 @@ void gr_do_fullscreen(int f){
int gr_toggle_fullscreen(void){
gr_do_fullscreen(!ogl_fullscreen);
// grd_curscreen->sc_mode=0;//hack to get it to reset screen mode
if (Screen_mode != SCREEN_GAME) // update viewing values for menus
{
glMatrixMode(GL_PROJECTION);
glLoadIdentity();
glOrtho(0.0, 1.0, 0.0, 1.0, -1.0, 1.0);
glMatrixMode(GL_MODELVIEW);
glLoadIdentity();//clear matrix
glEnable(GL_BLEND);
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
}
return ogl_fullscreen;
}

4
main/gamecntl.c
View file

@ -824,6 +824,10 @@ void HandleDemoKey(int key)
Newdemo_vcr_state = old_state;
break;
}
case KEY_ALTED+KEY_ENTER:
case KEY_ALTED+KEY_PADENTER:
gr_toggle_fullscreen();
break;
#ifdef MACINTOSH
case KEY_COMMAND+KEY_Q:

15
main/newmenu.c
View file

@ -1342,6 +1342,11 @@ int newmenu_do4( char * title, char * subtitle, int nitems, newmenu_item * item,
done = 1;
break;
case KEY_ALTED+KEY_ENTER:
case KEY_ALTED+KEY_PADENTER:
gr_toggle_fullscreen();
break;
case KEY_ESC:
if ( (choice>-1) && (item[choice].type==NM_TYPE_INPUT_MENU) && (item[choice].group==1)) {
item[choice].group=0;
@ -2273,6 +2278,11 @@ ReadFileNames:
break;
}
#endif
case KEY_ALTED+KEY_ENTER:
case KEY_ALTED+KEY_PADENTER:
gr_toggle_fullscreen();
break;
default:
{
@ -2668,6 +2678,11 @@ int newmenu_listbox1( char * title, int nitems, char * items[], int allow_abort_
}
#endif
case KEY_ALTED+KEY_ENTER:
case KEY_ALTED+KEY_PADENTER:
gr_toggle_fullscreen();
break;
default:
if ( key > 0 ) {
int ascii = key_to_ascii(key);