mirror of
https://github.com/isledecomp/isle-portable.git
synced 2026-01-19 13:51:16 +00:00
Add comment
This commit is contained in:
parent
d81d62a8b6
commit
3f5ac69b34
@ -230,6 +230,11 @@ void MxBackgroundAudioManager::StartAction(MxParam& p_param)
|
|||||||
m_action2.SetObjectId(m_pendingPresenter->GetAction()->GetObjectId());
|
m_action2.SetObjectId(m_pendingPresenter->GetAction()->GetObjectId());
|
||||||
m_targetVolume = ((MxDSSound*) (m_pendingPresenter->GetAction()))->GetVolume();
|
m_targetVolume = ((MxDSSound*) (m_pendingPresenter->GetAction()))->GetVolume();
|
||||||
m_pendingPresenter->SetVolume(0);
|
m_pendingPresenter->SetVolume(0);
|
||||||
|
|
||||||
|
// Disabling the action here and starting it later once the actively presented music has been faded out.
|
||||||
|
// This was not necessary in retail because the streaming layer would implicitly not start another action
|
||||||
|
// before the previous one has ended (since it's all coming from JUKEBOX.SI), however since we now
|
||||||
|
// allow loading music from multiple SI files this would cause the new music to start immediately.
|
||||||
m_pendingPresenter->GetAction()->SetFlags(m_pendingPresenter->GetAction()->GetFlags() & ~MxDSAction::c_enabled);
|
m_pendingPresenter->GetAction()->SetFlags(m_pendingPresenter->GetAction()->GetFlags() & ~MxDSAction::c_enabled);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -4,10 +4,14 @@
|
|||||||
#include "legoworld.h"
|
#include "legoworld.h"
|
||||||
#include "mxatom.h"
|
#include "mxatom.h"
|
||||||
|
|
||||||
#include <interleaf.h>
|
|
||||||
#include <map>
|
#include <map>
|
||||||
#include <vector>
|
#include <vector>
|
||||||
|
|
||||||
|
namespace si
|
||||||
|
{
|
||||||
|
class Core;
|
||||||
|
}
|
||||||
|
|
||||||
namespace Extensions
|
namespace Extensions
|
||||||
{
|
{
|
||||||
class SiLoader {
|
class SiLoader {
|
||||||
|
|||||||
@ -5,6 +5,7 @@
|
|||||||
#include "mxstreamer.h"
|
#include "mxstreamer.h"
|
||||||
|
|
||||||
#include <SDL3/SDL.h>
|
#include <SDL3/SDL.h>
|
||||||
|
#include <interleaf.h>
|
||||||
|
|
||||||
using namespace Extensions;
|
using namespace Extensions;
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user