Make sure got_z is not reset to 0 for Descent 1 missions - fixing crash, also make sure briefing hum is not played through more than one channel
This commit is contained in:
parent
dec98a025e
commit
73ba0a078f
|
@ -1,5 +1,9 @@
|
||||||
D2X-Rebirth Changelog
|
D2X-Rebirth Changelog
|
||||||
|
|
||||||
|
20100325
|
||||||
|
--------
|
||||||
|
main/titles.c: Make sure got_z is not reset to 0 for Descent 1 missions - fixing crash, also make sure briefing hum is not played through more than one channel
|
||||||
|
|
||||||
20100324
|
20100324
|
||||||
--------
|
--------
|
||||||
arch/include/event.h, arch/include/mouse.h, arch/sdl/mouse.c, main/kconfig.c, main/movie.c, main/newmenu.c, main/titles.c: Add EVENT_MOUSE_BUTTON_DOWN and EVENT_MOUSE_BUTTON_UP, use for all windows except game and editor. Fixes crash on iMac G5 when pressing keys to progress through briefing
|
arch/include/event.h, arch/include/mouse.h, arch/sdl/mouse.c, main/kconfig.c, main/movie.c, main/newmenu.c, main/titles.c: Add EVENT_MOUSE_BUTTON_DOWN and EVENT_MOUSE_BUTTON_UP, use for all windows except game and editor. Fixes crash on iMac G5 when pressing keys to progress through briefing
|
||||||
|
|
|
@ -1221,6 +1221,7 @@ int new_briefing_screen(briefing *br, int first)
|
||||||
int i;
|
int i;
|
||||||
|
|
||||||
br->new_screen = 0;
|
br->new_screen = 0;
|
||||||
|
br->got_z = 0;
|
||||||
|
|
||||||
if (EMULATING_D1)
|
if (EMULATING_D1)
|
||||||
{
|
{
|
||||||
|
@ -1261,8 +1262,7 @@ int new_briefing_screen(briefing *br, int first)
|
||||||
if (br->message==NULL)
|
if (br->message==NULL)
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
br->got_z = 0;
|
br->printing_channel = -1;
|
||||||
br->hum_channel = br->printing_channel = -1;
|
|
||||||
Current_color = 0;
|
Current_color = 0;
|
||||||
br->streamcount = 0;
|
br->streamcount = 0;
|
||||||
br->tab_stop = 0;
|
br->tab_stop = 0;
|
||||||
|
@ -1280,7 +1280,8 @@ int new_briefing_screen(briefing *br, int first)
|
||||||
br->prev_ch = -1;
|
br->prev_ch = -1;
|
||||||
|
|
||||||
#ifndef SHAREWARE
|
#ifndef SHAREWARE
|
||||||
br->hum_channel = digi_start_sound( digi_xlat_sound(SOUND_BRIEFING_HUM), F1_0/2, 0xFFFF/2, 1, -1, -1, -1 );
|
if (br->hum_channel == -1)
|
||||||
|
br->hum_channel = digi_start_sound( digi_xlat_sound(SOUND_BRIEFING_HUM), F1_0/2, 0xFFFF/2, 1, -1, -1, -1 );
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
return 1;
|
return 1;
|
||||||
|
|
Loading…
Reference in a new issue