Merge pull request ddnet#7366 from furo321/SoundsDetail

Remove "Detail" from sound layers.
Robyt3 · Oct 25, 2023 · 9220604 · 9220604
2 parents 9424be7 + 18f389f
commit 9220604
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/src/game/client/components/mapsounds.cpp b/src/game/client/components/mapsounds.cpp
@@ -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())
 			{

diff --git a/src/game/editor/popups.cpp b/src/game/editor/popups.cpp
@@ -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);