Skip to content

Commit a1caa7b

Browse files
committed
[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.
1 parent 9641ffc commit a1caa7b

File tree

1 file changed

+8
-4
lines changed

1 file changed

+8
-4
lines changed

tiberiandawn/init.cpp

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -511,10 +511,6 @@ bool Init_Game(int, char*[])
511511
MFCD::Cache("CONQUER.MIX");
512512
if (SampleType != 0 && !Debug_Quiet) {
513513
MFCD::Cache("SOUNDS.MIX");
514-
if (Special.IsJuvenile) {
515-
new MFCD("ZOUNDS.MIX"); // Cached.
516-
MFCD::Cache("ZOUNDS.MIX");
517-
}
518514
}
519515
}
520516
Call_Back();
@@ -618,6 +614,14 @@ bool Init_Game(int, char*[])
618614
*/
619615
Options.Load_Settings();
620616

617+
/*
618+
** Now that conquer.ini has been read, we can check if we need zounds.mix.
619+
*/
620+
if (!Is_Demo() && SampleType != 0 && !Debug_Quiet && Special.IsJuvenile) {
621+
new MFCD("ZOUNDS.MIX");
622+
MFCD::Cache("ZOUNDS.MIX");
623+
}
624+
621625
/*
622626
** Dump a default copy of rules.ini.
623627
*/

0 commit comments

Comments
 (0)