From 8ae8e25b33acf4ada99069ad8374ccef620ba0ed Mon Sep 17 00:00:00 2001
From: Roman Fomin <rfomin@gmail.com>
Date: Mon, 28 Jun 2021 13:31:24 +0700
Subject: [PATCH] add 200 dummy sounds for DEHEXTRA (#228)

* add 200 dummy sounds for DEHEXTRA

* skip dummy S_sfx entries in deh_procText
---
 Source/d_deh.c   |   2 +
 Source/i_sound.c |   7 +-
 Source/sounds.c  | 201 ++++++++++++++++++++++++++++++++++++++++++++++
 Source/sounds.h  | 203 +++++++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 412 insertions(+), 1 deletion(-)

diff --git a/Source/d_deh.c b/Source/d_deh.c
index 488e7cb0..99dd3151 100644
--- a/Source/d_deh.c
+++ b/Source/d_deh.c
@@ -2740,6 +2740,8 @@ void deh_procText(DEHFILE *fpin, FILE* fpout, char *line)
         // Try sound effects entries - see sounds.c
         for (i=1; i<NUMSFX; i++)
           {
+            // skip empty dummy entries in S_sfx[]
+            if (!S_sfx[i].name) continue;
             // avoid short prefix erroneous match
             if (strlen(S_sfx[i].name) != fromlen) continue;
             if (!strnicmp(S_sfx[i].name,inbuffer,fromlen))
diff --git a/Source/i_sound.c b/Source/i_sound.c
index be9849e2..156e26da 100644
--- a/Source/i_sound.c
+++ b/Source/i_sound.c
@@ -700,7 +700,12 @@ void I_InitSound(void)
          int i;
 
          printf("Precaching all sound effects...");
-         for (i = 1; i < NUMSFX; i++)
+         for (i = 1; i < NUM_NONEXTRA_SFX; i++)
+         {
+            addsfx(&S_sfx[i], 0, NORM_PITCH);
+         }
+         // DEHEXTRA has turned S_sfx into a sparse array
+         for (i = sfx_fre000; i < NUMSFX; i++)
          {
             addsfx(&S_sfx[i], 0, NORM_PITCH);
          }
diff --git a/Source/sounds.c b/Source/sounds.c
index 8a4bf9cc..60a2e5d9 100644
--- a/Source/sounds.c
+++ b/Source/sounds.c
@@ -237,6 +237,207 @@ sfxinfo_t S_sfx[] = {
 
   // [crispy] play DSSECRET if available
   { "secret",  sg_none,  100, 0, -1, -1, 0 },
+
+  [500] = { "fre000", sg_none, 127, 0, -1, -1, 0 },
+  [501] = { "fre001", sg_none, 127, 0, -1, -1, 0 },
+  [502] = { "fre002", sg_none, 127, 0, -1, -1, 0 },
+  [503] = { "fre003", sg_none, 127, 0, -1, -1, 0 },
+  [504] = { "fre004", sg_none, 127, 0, -1, -1, 0 },
+  [505] = { "fre005", sg_none, 127, 0, -1, -1, 0 },
+  [506] = { "fre006", sg_none, 127, 0, -1, -1, 0 },
+  [507] = { "fre007", sg_none, 127, 0, -1, -1, 0 },
+  [508] = { "fre008", sg_none, 127, 0, -1, -1, 0 },
+  [509] = { "fre009", sg_none, 127, 0, -1, -1, 0 },
+  [510] = { "fre010", sg_none, 127, 0, -1, -1, 0 },
+  [511] = { "fre011", sg_none, 127, 0, -1, -1, 0 },
+  [512] = { "fre012", sg_none, 127, 0, -1, -1, 0 },
+  [513] = { "fre013", sg_none, 127, 0, -1, -1, 0 },
+  [514] = { "fre014", sg_none, 127, 0, -1, -1, 0 },
+  [515] = { "fre015", sg_none, 127, 0, -1, -1, 0 },
+  [516] = { "fre016", sg_none, 127, 0, -1, -1, 0 },
+  [517] = { "fre017", sg_none, 127, 0, -1, -1, 0 },
+  [518] = { "fre018", sg_none, 127, 0, -1, -1, 0 },
+  [519] = { "fre019", sg_none, 127, 0, -1, -1, 0 },
+  [520] = { "fre020", sg_none, 127, 0, -1, -1, 0 },
+  [521] = { "fre021", sg_none, 127, 0, -1, -1, 0 },
+  [522] = { "fre022", sg_none, 127, 0, -1, -1, 0 },
+  [523] = { "fre023", sg_none, 127, 0, -1, -1, 0 },
+  [524] = { "fre024", sg_none, 127, 0, -1, -1, 0 },
+  [525] = { "fre025", sg_none, 127, 0, -1, -1, 0 },
+  [526] = { "fre026", sg_none, 127, 0, -1, -1, 0 },
+  [527] = { "fre027", sg_none, 127, 0, -1, -1, 0 },
+  [528] = { "fre028", sg_none, 127, 0, -1, -1, 0 },
+  [529] = { "fre029", sg_none, 127, 0, -1, -1, 0 },
+  [530] = { "fre030", sg_none, 127, 0, -1, -1, 0 },
+  [531] = { "fre031", sg_none, 127, 0, -1, -1, 0 },
+  [532] = { "fre032", sg_none, 127, 0, -1, -1, 0 },
+  [533] = { "fre033", sg_none, 127, 0, -1, -1, 0 },
+  [534] = { "fre034", sg_none, 127, 0, -1, -1, 0 },
+  [535] = { "fre035", sg_none, 127, 0, -1, -1, 0 },
+  [536] = { "fre036", sg_none, 127, 0, -1, -1, 0 },
+  [537] = { "fre037", sg_none, 127, 0, -1, -1, 0 },
+  [538] = { "fre038", sg_none, 127, 0, -1, -1, 0 },
+  [539] = { "fre039", sg_none, 127, 0, -1, -1, 0 },
+  [540] = { "fre040", sg_none, 127, 0, -1, -1, 0 },
+  [541] = { "fre041", sg_none, 127, 0, -1, -1, 0 },
+  [542] = { "fre042", sg_none, 127, 0, -1, -1, 0 },
+  [543] = { "fre043", sg_none, 127, 0, -1, -1, 0 },
+  [544] = { "fre044", sg_none, 127, 0, -1, -1, 0 },
+  [545] = { "fre045", sg_none, 127, 0, -1, -1, 0 },
+  [546] = { "fre046", sg_none, 127, 0, -1, -1, 0 },
+  [547] = { "fre047", sg_none, 127, 0, -1, -1, 0 },
+  [548] = { "fre048", sg_none, 127, 0, -1, -1, 0 },
+  [549] = { "fre049", sg_none, 127, 0, -1, -1, 0 },
+  [550] = { "fre050", sg_none, 127, 0, -1, -1, 0 },
+  [551] = { "fre051", sg_none, 127, 0, -1, -1, 0 },
+  [552] = { "fre052", sg_none, 127, 0, -1, -1, 0 },
+  [553] = { "fre053", sg_none, 127, 0, -1, -1, 0 },
+  [554] = { "fre054", sg_none, 127, 0, -1, -1, 0 },
+  [555] = { "fre055", sg_none, 127, 0, -1, -1, 0 },
+  [556] = { "fre056", sg_none, 127, 0, -1, -1, 0 },
+  [557] = { "fre057", sg_none, 127, 0, -1, -1, 0 },
+  [558] = { "fre058", sg_none, 127, 0, -1, -1, 0 },
+  [559] = { "fre059", sg_none, 127, 0, -1, -1, 0 },
+  [560] = { "fre060", sg_none, 127, 0, -1, -1, 0 },
+  [561] = { "fre061", sg_none, 127, 0, -1, -1, 0 },
+  [562] = { "fre062", sg_none, 127, 0, -1, -1, 0 },
+  [563] = { "fre063", sg_none, 127, 0, -1, -1, 0 },
+  [564] = { "fre064", sg_none, 127, 0, -1, -1, 0 },
+  [565] = { "fre065", sg_none, 127, 0, -1, -1, 0 },
+  [566] = { "fre066", sg_none, 127, 0, -1, -1, 0 },
+  [567] = { "fre067", sg_none, 127, 0, -1, -1, 0 },
+  [568] = { "fre068", sg_none, 127, 0, -1, -1, 0 },
+  [569] = { "fre069", sg_none, 127, 0, -1, -1, 0 },
+  [570] = { "fre070", sg_none, 127, 0, -1, -1, 0 },
+  [571] = { "fre071", sg_none, 127, 0, -1, -1, 0 },
+  [572] = { "fre072", sg_none, 127, 0, -1, -1, 0 },
+  [573] = { "fre073", sg_none, 127, 0, -1, -1, 0 },
+  [574] = { "fre074", sg_none, 127, 0, -1, -1, 0 },
+  [575] = { "fre075", sg_none, 127, 0, -1, -1, 0 },
+  [576] = { "fre076", sg_none, 127, 0, -1, -1, 0 },
+  [577] = { "fre077", sg_none, 127, 0, -1, -1, 0 },
+  [578] = { "fre078", sg_none, 127, 0, -1, -1, 0 },
+  [579] = { "fre079", sg_none, 127, 0, -1, -1, 0 },
+  [580] = { "fre080", sg_none, 127, 0, -1, -1, 0 },
+  [581] = { "fre081", sg_none, 127, 0, -1, -1, 0 },
+  [582] = { "fre082", sg_none, 127, 0, -1, -1, 0 },
+  [583] = { "fre083", sg_none, 127, 0, -1, -1, 0 },
+  [584] = { "fre084", sg_none, 127, 0, -1, -1, 0 },
+  [585] = { "fre085", sg_none, 127, 0, -1, -1, 0 },
+  [586] = { "fre086", sg_none, 127, 0, -1, -1, 0 },
+  [587] = { "fre087", sg_none, 127, 0, -1, -1, 0 },
+  [588] = { "fre088", sg_none, 127, 0, -1, -1, 0 },
+  [589] = { "fre089", sg_none, 127, 0, -1, -1, 0 },
+  [590] = { "fre090", sg_none, 127, 0, -1, -1, 0 },
+  [591] = { "fre091", sg_none, 127, 0, -1, -1, 0 },
+  [592] = { "fre092", sg_none, 127, 0, -1, -1, 0 },
+  [593] = { "fre093", sg_none, 127, 0, -1, -1, 0 },
+  [594] = { "fre094", sg_none, 127, 0, -1, -1, 0 },
+  [595] = { "fre095", sg_none, 127, 0, -1, -1, 0 },
+  [596] = { "fre096", sg_none, 127, 0, -1, -1, 0 },
+  [597] = { "fre097", sg_none, 127, 0, -1, -1, 0 },
+  [598] = { "fre098", sg_none, 127, 0, -1, -1, 0 },
+  [599] = { "fre099", sg_none, 127, 0, -1, -1, 0 },
+  [600] = { "fre100", sg_none, 127, 0, -1, -1, 0 },
+  [601] = { "fre101", sg_none, 127, 0, -1, -1, 0 },
+  [602] = { "fre102", sg_none, 127, 0, -1, -1, 0 },
+  [603] = { "fre103", sg_none, 127, 0, -1, -1, 0 },
+  [604] = { "fre104", sg_none, 127, 0, -1, -1, 0 },
+  [605] = { "fre105", sg_none, 127, 0, -1, -1, 0 },
+  [606] = { "fre106", sg_none, 127, 0, -1, -1, 0 },
+  [607] = { "fre107", sg_none, 127, 0, -1, -1, 0 },
+  [608] = { "fre108", sg_none, 127, 0, -1, -1, 0 },
+  [609] = { "fre109", sg_none, 127, 0, -1, -1, 0 },
+  [610] = { "fre110", sg_none, 127, 0, -1, -1, 0 },
+  [611] = { "fre111", sg_none, 127, 0, -1, -1, 0 },
+  [612] = { "fre112", sg_none, 127, 0, -1, -1, 0 },
+  [613] = { "fre113", sg_none, 127, 0, -1, -1, 0 },
+  [614] = { "fre114", sg_none, 127, 0, -1, -1, 0 },
+  [615] = { "fre115", sg_none, 127, 0, -1, -1, 0 },
+  [616] = { "fre116", sg_none, 127, 0, -1, -1, 0 },
+  [617] = { "fre117", sg_none, 127, 0, -1, -1, 0 },
+  [618] = { "fre118", sg_none, 127, 0, -1, -1, 0 },
+  [619] = { "fre119", sg_none, 127, 0, -1, -1, 0 },
+  [620] = { "fre120", sg_none, 127, 0, -1, -1, 0 },
+  [621] = { "fre121", sg_none, 127, 0, -1, -1, 0 },
+  [622] = { "fre122", sg_none, 127, 0, -1, -1, 0 },
+  [623] = { "fre123", sg_none, 127, 0, -1, -1, 0 },
+  [624] = { "fre124", sg_none, 127, 0, -1, -1, 0 },
+  [625] = { "fre125", sg_none, 127, 0, -1, -1, 0 },
+  [626] = { "fre126", sg_none, 127, 0, -1, -1, 0 },
+  [627] = { "fre127", sg_none, 127, 0, -1, -1, 0 },
+  [628] = { "fre128", sg_none, 127, 0, -1, -1, 0 },
+  [629] = { "fre129", sg_none, 127, 0, -1, -1, 0 },
+  [630] = { "fre130", sg_none, 127, 0, -1, -1, 0 },
+  [631] = { "fre131", sg_none, 127, 0, -1, -1, 0 },
+  [632] = { "fre132", sg_none, 127, 0, -1, -1, 0 },
+  [633] = { "fre133", sg_none, 127, 0, -1, -1, 0 },
+  [634] = { "fre134", sg_none, 127, 0, -1, -1, 0 },
+  [635] = { "fre135", sg_none, 127, 0, -1, -1, 0 },
+  [636] = { "fre136", sg_none, 127, 0, -1, -1, 0 },
+  [637] = { "fre137", sg_none, 127, 0, -1, -1, 0 },
+  [638] = { "fre138", sg_none, 127, 0, -1, -1, 0 },
+  [639] = { "fre139", sg_none, 127, 0, -1, -1, 0 },
+  [640] = { "fre140", sg_none, 127, 0, -1, -1, 0 },
+  [641] = { "fre141", sg_none, 127, 0, -1, -1, 0 },
+  [642] = { "fre142", sg_none, 127, 0, -1, -1, 0 },
+  [643] = { "fre143", sg_none, 127, 0, -1, -1, 0 },
+  [644] = { "fre144", sg_none, 127, 0, -1, -1, 0 },
+  [645] = { "fre145", sg_none, 127, 0, -1, -1, 0 },
+  [646] = { "fre146", sg_none, 127, 0, -1, -1, 0 },
+  [647] = { "fre147", sg_none, 127, 0, -1, -1, 0 },
+  [648] = { "fre148", sg_none, 127, 0, -1, -1, 0 },
+  [649] = { "fre149", sg_none, 127, 0, -1, -1, 0 },
+  [650] = { "fre150", sg_none, 127, 0, -1, -1, 0 },
+  [651] = { "fre151", sg_none, 127, 0, -1, -1, 0 },
+  [652] = { "fre152", sg_none, 127, 0, -1, -1, 0 },
+  [653] = { "fre153", sg_none, 127, 0, -1, -1, 0 },
+  [654] = { "fre154", sg_none, 127, 0, -1, -1, 0 },
+  [655] = { "fre155", sg_none, 127, 0, -1, -1, 0 },
+  [656] = { "fre156", sg_none, 127, 0, -1, -1, 0 },
+  [657] = { "fre157", sg_none, 127, 0, -1, -1, 0 },
+  [658] = { "fre158", sg_none, 127, 0, -1, -1, 0 },
+  [659] = { "fre159", sg_none, 127, 0, -1, -1, 0 },
+  [660] = { "fre160", sg_none, 127, 0, -1, -1, 0 },
+  [661] = { "fre161", sg_none, 127, 0, -1, -1, 0 },
+  [662] = { "fre162", sg_none, 127, 0, -1, -1, 0 },
+  [663] = { "fre163", sg_none, 127, 0, -1, -1, 0 },
+  [664] = { "fre164", sg_none, 127, 0, -1, -1, 0 },
+  [665] = { "fre165", sg_none, 127, 0, -1, -1, 0 },
+  [666] = { "fre166", sg_none, 127, 0, -1, -1, 0 },
+  [667] = { "fre167", sg_none, 127, 0, -1, -1, 0 },
+  [668] = { "fre168", sg_none, 127, 0, -1, -1, 0 },
+  [669] = { "fre169", sg_none, 127, 0, -1, -1, 0 },
+  [670] = { "fre170", sg_none, 127, 0, -1, -1, 0 },
+  [671] = { "fre171", sg_none, 127, 0, -1, -1, 0 },
+  [672] = { "fre172", sg_none, 127, 0, -1, -1, 0 },
+  [673] = { "fre173", sg_none, 127, 0, -1, -1, 0 },
+  [674] = { "fre174", sg_none, 127, 0, -1, -1, 0 },
+  [675] = { "fre175", sg_none, 127, 0, -1, -1, 0 },
+  [676] = { "fre176", sg_none, 127, 0, -1, -1, 0 },
+  [677] = { "fre177", sg_none, 127, 0, -1, -1, 0 },
+  [678] = { "fre178", sg_none, 127, 0, -1, -1, 0 },
+  [679] = { "fre179", sg_none, 127, 0, -1, -1, 0 },
+  [680] = { "fre180", sg_none, 127, 0, -1, -1, 0 },
+  [681] = { "fre181", sg_none, 127, 0, -1, -1, 0 },
+  [682] = { "fre182", sg_none, 127, 0, -1, -1, 0 },
+  [683] = { "fre183", sg_none, 127, 0, -1, -1, 0 },
+  [684] = { "fre184", sg_none, 127, 0, -1, -1, 0 },
+  [685] = { "fre185", sg_none, 127, 0, -1, -1, 0 },
+  [686] = { "fre186", sg_none, 127, 0, -1, -1, 0 },
+  [687] = { "fre187", sg_none, 127, 0, -1, -1, 0 },
+  [688] = { "fre188", sg_none, 127, 0, -1, -1, 0 },
+  [689] = { "fre189", sg_none, 127, 0, -1, -1, 0 },
+  [690] = { "fre190", sg_none, 127, 0, -1, -1, 0 },
+  [691] = { "fre191", sg_none, 127, 0, -1, -1, 0 },
+  [692] = { "fre192", sg_none, 127, 0, -1, -1, 0 },
+  [693] = { "fre193", sg_none, 127, 0, -1, -1, 0 },
+  [694] = { "fre194", sg_none, 127, 0, -1, -1, 0 },
+  [695] = { "fre195", sg_none, 127, 0, -1, -1, 0 },
+  [696] = { "fre196", sg_none, 127, 0, -1, -1, 0 },
+  [697] = { "fre197", sg_none, 127, 0, -1, -1, 0 },
+  [698] = { "fre198", sg_none, 127, 0, -1, -1, 0 },
+  [699] = { "fre199", sg_none, 127, 0, -1, -1, 0 },
 };
 
 //----------------------------------------------------------------------------
diff --git a/Source/sounds.h b/Source/sounds.h
index c67c2e27..6a45d2e2 100644
--- a/Source/sounds.h
+++ b/Source/sounds.h
@@ -310,6 +310,209 @@ typedef enum {
   // [crispy] play DSSECRET if available
   sfx_secret,
 
+  NUM_NONEXTRA_SFX,
+
+  sfx_fre000 = 500,
+  sfx_fre001,
+  sfx_fre002,
+  sfx_fre003,
+  sfx_fre004,
+  sfx_fre005,
+  sfx_fre006,
+  sfx_fre007,
+  sfx_fre008,
+  sfx_fre009,
+  sfx_fre010,
+  sfx_fre011,
+  sfx_fre012,
+  sfx_fre013,
+  sfx_fre014,
+  sfx_fre015,
+  sfx_fre016,
+  sfx_fre017,
+  sfx_fre018,
+  sfx_fre019,
+  sfx_fre020,
+  sfx_fre021,
+  sfx_fre022,
+  sfx_fre023,
+  sfx_fre024,
+  sfx_fre025,
+  sfx_fre026,
+  sfx_fre027,
+  sfx_fre028,
+  sfx_fre029,
+  sfx_fre030,
+  sfx_fre031,
+  sfx_fre032,
+  sfx_fre033,
+  sfx_fre034,
+  sfx_fre035,
+  sfx_fre036,
+  sfx_fre037,
+  sfx_fre038,
+  sfx_fre039,
+  sfx_fre040,
+  sfx_fre041,
+  sfx_fre042,
+  sfx_fre043,
+  sfx_fre044,
+  sfx_fre045,
+  sfx_fre046,
+  sfx_fre047,
+  sfx_fre048,
+  sfx_fre049,
+  sfx_fre050,
+  sfx_fre051,
+  sfx_fre052,
+  sfx_fre053,
+  sfx_fre054,
+  sfx_fre055,
+  sfx_fre056,
+  sfx_fre057,
+  sfx_fre058,
+  sfx_fre059,
+  sfx_fre060,
+  sfx_fre061,
+  sfx_fre062,
+  sfx_fre063,
+  sfx_fre064,
+  sfx_fre065,
+  sfx_fre066,
+  sfx_fre067,
+  sfx_fre068,
+  sfx_fre069,
+  sfx_fre070,
+  sfx_fre071,
+  sfx_fre072,
+  sfx_fre073,
+  sfx_fre074,
+  sfx_fre075,
+  sfx_fre076,
+  sfx_fre077,
+  sfx_fre078,
+  sfx_fre079,
+  sfx_fre080,
+  sfx_fre081,
+  sfx_fre082,
+  sfx_fre083,
+  sfx_fre084,
+  sfx_fre085,
+  sfx_fre086,
+  sfx_fre087,
+  sfx_fre088,
+  sfx_fre089,
+  sfx_fre090,
+  sfx_fre091,
+  sfx_fre092,
+  sfx_fre093,
+  sfx_fre094,
+  sfx_fre095,
+  sfx_fre096,
+  sfx_fre097,
+  sfx_fre098,
+  sfx_fre099,
+  sfx_fre100,
+  sfx_fre101,
+  sfx_fre102,
+  sfx_fre103,
+  sfx_fre104,
+  sfx_fre105,
+  sfx_fre106,
+  sfx_fre107,
+  sfx_fre108,
+  sfx_fre109,
+  sfx_fre110,
+  sfx_fre111,
+  sfx_fre112,
+  sfx_fre113,
+  sfx_fre114,
+  sfx_fre115,
+  sfx_fre116,
+  sfx_fre117,
+  sfx_fre118,
+  sfx_fre119,
+  sfx_fre120,
+  sfx_fre121,
+  sfx_fre122,
+  sfx_fre123,
+  sfx_fre124,
+  sfx_fre125,
+  sfx_fre126,
+  sfx_fre127,
+  sfx_fre128,
+  sfx_fre129,
+  sfx_fre130,
+  sfx_fre131,
+  sfx_fre132,
+  sfx_fre133,
+  sfx_fre134,
+  sfx_fre135,
+  sfx_fre136,
+  sfx_fre137,
+  sfx_fre138,
+  sfx_fre139,
+  sfx_fre140,
+  sfx_fre141,
+  sfx_fre142,
+  sfx_fre143,
+  sfx_fre144,
+  sfx_fre145,
+  sfx_fre146,
+  sfx_fre147,
+  sfx_fre148,
+  sfx_fre149,
+  sfx_fre150,
+  sfx_fre151,
+  sfx_fre152,
+  sfx_fre153,
+  sfx_fre154,
+  sfx_fre155,
+  sfx_fre156,
+  sfx_fre157,
+  sfx_fre158,
+  sfx_fre159,
+  sfx_fre160,
+  sfx_fre161,
+  sfx_fre162,
+  sfx_fre163,
+  sfx_fre164,
+  sfx_fre165,
+  sfx_fre166,
+  sfx_fre167,
+  sfx_fre168,
+  sfx_fre169,
+  sfx_fre170,
+  sfx_fre171,
+  sfx_fre172,
+  sfx_fre173,
+  sfx_fre174,
+  sfx_fre175,
+  sfx_fre176,
+  sfx_fre177,
+  sfx_fre178,
+  sfx_fre179,
+  sfx_fre180,
+  sfx_fre181,
+  sfx_fre182,
+  sfx_fre183,
+  sfx_fre184,
+  sfx_fre185,
+  sfx_fre186,
+  sfx_fre187,
+  sfx_fre188,
+  sfx_fre189,
+  sfx_fre190,
+  sfx_fre191,
+  sfx_fre192,
+  sfx_fre193,
+  sfx_fre194,
+  sfx_fre195,
+  sfx_fre196,
+  sfx_fre197,
+  sfx_fre198,
+  sfx_fre199,
+
   NUMSFX
 } sfxenum_t;