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

Turn fullscreen off when showing a messagebox for Mac; move songs_play_song(SONG_TITLE) from inferno.c to titles.c

Browse source
This commit is contained in:
Chris Taylor 2010-11-30 23:40:27 +08:00
parent 427fb6d6b5
commit c34763b070
4 changed files with 14 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.txt
View file

@ -4,6 +4,7 @@ D1X-Rebirth Changelog
--------
include/hmp.h, misc/hmp.c: Little fixes for rev939 - changed definition from WIN32 to _WIN32, added little hack for incorrectly set HMP loop in Descent2-version of descent.hmp
SConstruct, arch/include/messagebox.h, arch/win32/messagebox.c, main/inferno.c, misc/error.c: Add support for Windows native error/warning boxes; Only print to stdout on Linux/other *nix; Fixed redundant printing of Error and Warning via stdout
arch/carbon/messagebox.c, main/inferno.c, main/titles.c: Turn fullscreen off when showing a messagebox for Mac; move songs_play_song(SONG_TITLE) from inferno.c to titles.c
20101128
--------

15
arch/carbon/messagebox.c
View file

@ -18,17 +18,21 @@
void display_mac_alert(char *message, int error)
{
int16_t itemHit;
uint response;
bool osX = FALSE;
d_event event = { EVENT_WINDOW_DEACTIVATED };
window *wind;
d_event event = { EVENT_WINDOW_DEACTIVATED };
int fullscreen;
bool osX = FALSE;
uint response;
int16_t itemHit;
// Handle Descent's windows properly
if ((wind = window_get_front()))
window_send_event(window_get_front(), &event);
event.type = EVENT_WINDOW_ACTIVATED;
if ((fullscreen = gr_check_fullscreen()))
gr_toggle_fullscreen();
osX = ( Gestalt(gestaltSystemVersion, (long *) &response) == noErr)
&& (response >= 0x01000 );
@ -72,6 +76,9 @@ void display_mac_alert(char *message, int error)
if (wind)
window_send_event(window_get_front(), &event);
if (!error && fullscreen)
gr_toggle_fullscreen();
}
void msgbox_warning(char *message)

1
main/inferno.c
View file

@ -373,7 +373,6 @@ int main(int argc, char *argv[])
set_default_handler(standard_handler);
songs_play_song( SONG_TITLE, 1 );
show_titles();
set_screen_mode(SCREEN_MENU);

2
main/titles.c
View file

@ -181,6 +181,8 @@ void show_titles(void)
{
char publisher[16];
songs_play_song( SONG_TITLE, 1 );
if (GameArg.SysNoTitles)
return;