Merge pull request #7366 from furo321/SoundsDetail

Remove "Detail" from sound layers.
This commit is contained in:
Dennis Felsing 2023-10-25 09:21:05 +00:00 committed by GitHub
commit 92206044d1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 1 deletions

View file

@ -118,7 +118,7 @@ void CMapSounds::OnRender()
Client()->IntraGameTick(g_Config.m_ClDummy));
}
float Offset = s_Time - Source.m_pSource->m_TimeDelay;
if(!DemoPlayerPaused && Offset >= 0.0f && g_Config.m_SndEnable && (g_Config.m_GfxHighDetail || !Source.m_HighDetail))
if(!DemoPlayerPaused && Offset >= 0.0f && g_Config.m_SndEnable)
{
if(Source.m_Voice.IsValid())
{

View file

@ -724,6 +724,12 @@ CUI::EPopupMenuFunctionResult CEditor::PopupLayer(void *pContext, CUIRect View,
aProps[2].m_Type = PROPTYPE_NULL;
}
// don't use Detail from the selection if this is a sound layer
if(pCurrentLayer->m_Type == LAYERTYPE_SOUNDS)
{
aProps[2].m_Type = PROPTYPE_NULL;
}
static int s_aIds[NUM_PROPS] = {0};
int NewVal = 0;
int Prop = pEditor->DoProperties(&View, aProps, s_aIds, &NewVal);