mirror of
https://github.com/ZDoom/raze-gles.git
synced 2024-11-10 23:02:03 +00:00
- fixed some issues with prematurely terminated sounds.
This commit is contained in:
parent
3cfba26bec
commit
294a806793
4 changed files with 4 additions and 5 deletions
|
@ -209,7 +209,7 @@ static void GameTicker()
|
||||||
case ga_mainmenunostopsound:
|
case ga_mainmenunostopsound:
|
||||||
gi->FreeLevelData();
|
gi->FreeLevelData();
|
||||||
gamestate = GS_MENUSCREEN;
|
gamestate = GS_MENUSCREEN;
|
||||||
M_StartControlPanel(false);
|
M_StartControlPanel(ga == ga_mainmenu);
|
||||||
M_SetMenu(NAME_Mainmenu);
|
M_SetMenu(NAME_Mainmenu);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
|
|
@ -43,7 +43,6 @@ void GameInterface::MenuOpened()
|
||||||
{
|
{
|
||||||
GrabPalette();
|
GrabPalette();
|
||||||
menuDelegate->FloatVar(NAME_zoomsize) = 0;
|
menuDelegate->FloatVar(NAME_zoomsize) = 0;
|
||||||
StopAllSounds();
|
|
||||||
StopLocalSound();
|
StopLocalSound();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -138,7 +138,7 @@ static void Intermission(MapRecord *from_map, MapRecord *to_map)
|
||||||
{
|
{
|
||||||
TArray<JobDesc> jobs;
|
TArray<JobDesc> jobs;
|
||||||
|
|
||||||
StopAllSounds();
|
if (from_map) StopAllSounds();
|
||||||
bCamera = false;
|
bCamera = false;
|
||||||
automapMode = am_off;
|
automapMode = am_off;
|
||||||
|
|
||||||
|
|
|
@ -133,8 +133,8 @@ void GameInterface::Startup()
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
if (!userConfig.nologo) fi.ShowLogo([](bool) { gameaction = ga_mainmenu; });
|
if (!userConfig.nologo) fi.ShowLogo([](bool) { gameaction = ga_mainmenunostopsound; });
|
||||||
else gameaction = ga_mainmenu;
|
else gameaction = ga_mainmenunostopsound;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue