From a1caa7bd3577edef764c1108acd03cee09687a32 Mon Sep 17 00:00:00 2001 From: OmniBlade Date: Tue, 25 Jun 2024 09:15:28 +0100 Subject: [PATCH] [TD] Fix loading of zounds.mix. Loading was previously gated behind a check for Special.IsJuvenile which isn't set until later in the init process. --- tiberiandawn/init.cpp | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/tiberiandawn/init.cpp b/tiberiandawn/init.cpp index f8c79db2..8f3dede3 100644 --- a/tiberiandawn/init.cpp +++ b/tiberiandawn/init.cpp @@ -511,10 +511,6 @@ bool Init_Game(int, char*[]) MFCD::Cache("CONQUER.MIX"); if (SampleType != 0 && !Debug_Quiet) { MFCD::Cache("SOUNDS.MIX"); - if (Special.IsJuvenile) { - new MFCD("ZOUNDS.MIX"); // Cached. - MFCD::Cache("ZOUNDS.MIX"); - } } } Call_Back(); @@ -618,6 +614,14 @@ bool Init_Game(int, char*[]) */ Options.Load_Settings(); + /* + ** Now that conquer.ini has been read, we can check if we need zounds.mix. + */ + if (!Is_Demo() && SampleType != 0 && !Debug_Quiet && Special.IsJuvenile) { + new MFCD("ZOUNDS.MIX"); + MFCD::Cache("ZOUNDS.MIX"); + } + /* ** Dump a default copy of rules.ini. */