OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- serialize the temporary music volume that can be set through ACS.

Browse source
This commit is contained in:
Christoph Oelckers 2018-03-24 13:06:37 +01:00
commit da74b9df95
7 changed files with 25 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/g_level.cpp
View file

@ -87,6 +87,7 @@
#include "vm.h"
#include "events.h"
#include "dobjgc.h"
#include "i_music.h"
#include "gi.h"
@ -600,6 +601,7 @@ void G_ChangeLevel(const char *levelname, int position, int flags, int nextSkill
startpos = position;
gameaction = ga_completed;
level.SetMusicVolume(1.0);
if (nextinfo != NULL)
{
@ -1469,6 +1471,7 @@ void G_InitLevelLocals ()
level.levelnum = info->levelnum;
level.Music = info->Music;
level.musicorder = info->musicorder;
level.MusicVolume = 1.f;
level.LevelName = level.info->LookupLevelName();
level.NextMap = info->NextMap;
@ -1960,6 +1963,17 @@ DEFINE_ACTION_FUNCTION(FLevelLocals, SetInterMusic)
//
//==========================================================================
void FLevelLocals::SetMusicVolume(float f)
{
MusicVolume = f;
I_SetMusicVolume(f);
}
//==========================================================================
//
//
//==========================================================================
template <typename T>
inline T VecDiff(const T& v1, const T& v2)
{