mirror of
https://github.com/isledecomp/isle.git
synced 2026-01-26 17:51:16 +00:00
Merge branch 'master' into mxvideopresenter
This commit is contained in:
commit
2625fe2756
@ -233,7 +233,7 @@ void MxMediaPresenter::EndAction()
|
|||||||
if (m_action->GetFlags() & MxDSAction::Flag_World &&
|
if (m_action->GetFlags() & MxDSAction::Flag_World &&
|
||||||
(!m_compositePresenter || !m_compositePresenter->VTable0x64(2))) {
|
(!m_compositePresenter || !m_compositePresenter->VTable0x64(2))) {
|
||||||
MxPresenter::Enable(FALSE);
|
MxPresenter::Enable(FALSE);
|
||||||
SetTickleState(TickleState::TickleState_Idle);
|
SetTickleState(TickleState_Idle);
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
MxDSAction* action = m_action;
|
MxDSAction* action = m_action;
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user