[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.

Author: OmniBlade

tiberiandawn/init.cpp

@@ -306,7 +306,7 @@ bool Init_Game(int, char*[])
         sprintf(buffer, "Command & Conquer kann Ihren Maustreiber nicht finden..");
 #else
 #ifdef FRENCH
-        sprintf(buffer, "Command & Conquer ne peut pas d�tecter votre gestionnaire de souris.");
+        sprintf(buffer, "Command & Conquer ne peut pas d?tecter votre gestionnaire de souris.");
 #else
         sprintf(buffer, "Command & Conquer is unable to detect your mouse driver.");
 #endif
@@ -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.
     */
@@ -1665,20 +1669,20 @@ bool Parse_Command_Line(int argc, char* argv[])
                  "              (Syntax: DESTNETxx.xx.xx.xx)\r\n"
                  "  -SOCKET   = Kennung des Netzwerk-Sockets (0 - 16383)\n"
                  "  -STEALTH  = Namen im Mehrspieler-Modus verstecken (\"Boss-Modus\")\r\n"
-                 "  -MESSAGES = Mitteilungen von au�erhalb des Spiels zulassen\r\n"
+                 "  -MESSAGES = Mitteilungen von au?erhalb des Spiels zulassen\r\n"
                  //					"  -ELITE    = Fortgeschrittene KI und Gefechtstechniken.\r\n"
                  "\r\n");
 #else
 #ifdef FRENCH
             puts("Command & Conquer (c) 1995, Westwood Studios\r\n"
-                 "Param�tres:\r\n"
-                 //						"  -CD<chemin d'acc�s> = Recherche des fichiers dans le\r\n"
-                 //						"                        r�pertoire indiqu�.\r\n"
-                 "  -DESTNET  = Sp�cifier le num�ro de r�seau du syst�me de destination\r\n"
+                 "Param?tres:\r\n"
+                 //						"  -CD<chemin d'acc?s> = Recherche des fichiers dans le\r\n"
+                 //						"                        r?pertoire indiqu?.\r\n"
+                 "  -DESTNET  = Sp?cifier le num?ro de r?seau du syst?me de destination\r\n"
                  "              (Syntaxe: DESTNETxx.xx.xx.xx)\r\n"
-                 "  -SOCKET   = ID poste r�seau (0 � 16383)\r\n"
+                 "  -SOCKET   = ID poste r?seau (0 ? 16383)\r\n"
                  "  -STEALTH  = Cacher les noms en mode multijoueurs (\"Mode Boss\")\r\n"
-                 "  -MESSAGES = Autorise les messages ext�rieurs � ce jeu.\r\n"
+                 "  -MESSAGES = Autorise les messages ext?rieurs ? ce jeu.\r\n"
                  "\r\n");
 #else
             puts("Command & Conquer (c) 1995, 1996 Westwood Studios\r\n"
@@ -2075,9 +2079,9 @@ void Parse_INI_File(void)
     /*
     ** These arrays store the coded version of the names Geologic, Period, & Jurassic.
     ** Decode them by subtracting 83.  For you curious types, the names look like:
-    ** ��¿º��
-    ** ��ż·
-    ** ?�Ŵ�Ƽ�
+    ** ??¨§??
+    ** ???ú
+    ** ??????
     ** If these INI entries aren't found, the IsJurassic flag does nothing.
     */
     static char coded_section[] = {154, 184, 194, 191, 194, 186, 188, 182, 0};