Turn fullscreen off when showing a messagebox for Mac; move songs_play_song(SONG_TITLE) from inferno.c to titles.c
This commit is contained in:
parent
427fb6d6b5
commit
c34763b070
|
@ -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
|
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
|
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
|
20101128
|
||||||
--------
|
--------
|
||||||
|
|
|
@ -18,17 +18,21 @@
|
||||||
|
|
||||||
void display_mac_alert(char *message, int error)
|
void display_mac_alert(char *message, int error)
|
||||||
{
|
{
|
||||||
int16_t itemHit;
|
|
||||||
uint response;
|
|
||||||
bool osX = FALSE;
|
|
||||||
d_event event = { EVENT_WINDOW_DEACTIVATED };
|
|
||||||
window *wind;
|
window *wind;
|
||||||
|
d_event event = { EVENT_WINDOW_DEACTIVATED };
|
||||||
|
int fullscreen;
|
||||||
|
bool osX = FALSE;
|
||||||
|
uint response;
|
||||||
|
int16_t itemHit;
|
||||||
|
|
||||||
// Handle Descent's windows properly
|
// Handle Descent's windows properly
|
||||||
if ((wind = window_get_front()))
|
if ((wind = window_get_front()))
|
||||||
window_send_event(window_get_front(), &event);
|
window_send_event(window_get_front(), &event);
|
||||||
event.type = EVENT_WINDOW_ACTIVATED;
|
event.type = EVENT_WINDOW_ACTIVATED;
|
||||||
|
|
||||||
|
if ((fullscreen = gr_check_fullscreen()))
|
||||||
|
gr_toggle_fullscreen();
|
||||||
|
|
||||||
osX = ( Gestalt(gestaltSystemVersion, (long *) &response) == noErr)
|
osX = ( Gestalt(gestaltSystemVersion, (long *) &response) == noErr)
|
||||||
&& (response >= 0x01000 );
|
&& (response >= 0x01000 );
|
||||||
|
|
||||||
|
@ -72,6 +76,9 @@ void display_mac_alert(char *message, int error)
|
||||||
|
|
||||||
if (wind)
|
if (wind)
|
||||||
window_send_event(window_get_front(), &event);
|
window_send_event(window_get_front(), &event);
|
||||||
|
|
||||||
|
if (!error && fullscreen)
|
||||||
|
gr_toggle_fullscreen();
|
||||||
}
|
}
|
||||||
|
|
||||||
void msgbox_warning(char *message)
|
void msgbox_warning(char *message)
|
||||||
|
|
|
@ -373,7 +373,6 @@ int main(int argc, char *argv[])
|
||||||
|
|
||||||
set_default_handler(standard_handler);
|
set_default_handler(standard_handler);
|
||||||
|
|
||||||
songs_play_song( SONG_TITLE, 1 );
|
|
||||||
show_titles();
|
show_titles();
|
||||||
|
|
||||||
set_screen_mode(SCREEN_MENU);
|
set_screen_mode(SCREEN_MENU);
|
||||||
|
|
|
@ -181,6 +181,8 @@ void show_titles(void)
|
||||||
{
|
{
|
||||||
char publisher[16];
|
char publisher[16];
|
||||||
|
|
||||||
|
songs_play_song( SONG_TITLE, 1 );
|
||||||
|
|
||||||
if (GameArg.SysNoTitles)
|
if (GameArg.SysNoTitles)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue