- split off all music code from s_sound.cpp
This commit is contained in:
parent
1595bf30c6
commit
66db894866
25 changed files with 1075 additions and 808 deletions
|
|
@ -102,6 +102,7 @@
|
|||
#include "g_cvars.h"
|
||||
#include "r_data/r_vanillatrans.h"
|
||||
#include "atterm.h"
|
||||
#include "s_music.h"
|
||||
|
||||
EXTERN_CVAR(Bool, hud_althud)
|
||||
EXTERN_CVAR(Int, vr_mode)
|
||||
|
|
@ -1034,6 +1035,7 @@ void D_DoomLoop ()
|
|||
// Update display, next frame, with current state.
|
||||
I_StartTic ();
|
||||
D_Display ();
|
||||
S_UpdateMusic();
|
||||
if (wantToRestart)
|
||||
{
|
||||
wantToRestart = false;
|
||||
|
|
@ -2459,6 +2461,7 @@ void D_DoomMain (void)
|
|||
|
||||
if (!batchrun) Printf ("S_Init: Setting up sound.\n");
|
||||
S_Init ();
|
||||
S_InitMusic();
|
||||
|
||||
if (!batchrun) Printf ("ST_Init: Init startup screen.\n");
|
||||
if (!restart)
|
||||
|
|
@ -2752,6 +2755,7 @@ void D_DoomMain (void)
|
|||
R_DeinitTranslationTables(); // some tables are initialized from outside the translation code.
|
||||
gameinfo.~gameinfo_t();
|
||||
new (&gameinfo) gameinfo_t; // Reset gameinfo
|
||||
S_ShutdownMusic();
|
||||
S_Shutdown(); // free all channels and delete playlist
|
||||
C_ClearAliases(); // CCMDs won't be reinitialized so these need to be deleted here
|
||||
DestroyCVarsFlagged(CVAR_MOD); // Delete any cvar left by mods
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue