Clean up of the audio header files, all games.

skyjake · Dec 5, 2008 · 88c0641 · 88c0641
1 parent 144c11c
commit 88c0641
Show file tree

Hide file tree

Showing 28 changed files with 2,328 additions and 2,664 deletions.
diff --git a/doomsday/build/codeblocks/jdoom.cbp b/doomsday/build/codeblocks/jdoom.cbp
@@ -311,8 +311,6 @@
 		<Unit filename="..\..\plugins\jdoom\include\p_spec.h" />
 		<Unit filename="..\..\plugins\jdoom\include\p_telept.h" />
 		<Unit filename="..\..\plugins\jdoom\include\r_defs.h" />
-		<Unit filename="..\..\plugins\jdoom\include\s_sound.h" />
-		<Unit filename="..\..\plugins\jdoom\include\sndidx.h" />
 		<Unit filename="..\..\plugins\jdoom\include\st_stuff.h" />
 		<Unit filename="..\..\plugins\jdoom\include\tables.h" />
 		<Unit filename="..\..\plugins\jdoom\include\version.h" />

diff --git a/doomsday/build/codeblocks/jdoom64.cbp b/doomsday/build/codeblocks/jdoom64.cbp
@@ -301,7 +301,6 @@
 		<Unit filename="..\..\plugins\jdoom64\include\p_spec.h" />
 		<Unit filename="..\..\plugins\jdoom64\include\p_telept.h" />
 		<Unit filename="..\..\plugins\jdoom64\include\r_defs.h" />
-		<Unit filename="..\..\plugins\jdoom64\include\sndidx.h" />
 		<Unit filename="..\..\plugins\jdoom64\include\st_stuff.h" />
 		<Unit filename="..\..\plugins\jdoom64\include\tables.h" />
 		<Unit filename="..\..\plugins\jdoom64\include\version.h" />

diff --git a/doomsday/build/codeblocks/jheretic.cbp b/doomsday/build/codeblocks/jheretic.cbp
@@ -217,8 +217,6 @@
 		<Unit filename="..\..\plugins\jheretic\include\r_defs.h" />
 		<Unit filename="..\..\plugins\jheretic\include\r_local.h" />
 		<Unit filename="..\..\plugins\jheretic\include\resource.h" />
-		<Unit filename="..\..\plugins\jheretic\include\sounds.h" />
-		<Unit filename="..\..\plugins\jheretic\include\soundst.h" />
 		<Unit filename="..\..\plugins\jheretic\include\st_stuff.h" />
 		<Unit filename="..\..\plugins\jheretic\include\tables.h" />
 		<Unit filename="..\..\plugins\jheretic\include\version.h" />

diff --git a/doomsday/build/codeblocks/jhexen.cbp b/doomsday/build/codeblocks/jhexen.cbp
@@ -293,6 +293,7 @@
 		<Unit filename="..\..\plugins\jhexen\include\p_pillar.h" />
 		<Unit filename="..\..\plugins\jhexen\include\p_pspr.h" />
 		<Unit filename="..\..\plugins\jhexen\include\p_setup.h" />
+		<Unit filename="..\..\plugins\jhexen\include\p_sound.h" />
 		<Unit filename="..\..\plugins\jhexen\include\p_spec.h" />
 		<Unit filename="..\..\plugins\jhexen\include\p_telept.h" />
 		<Unit filename="..\..\plugins\jhexen\include\p_things.h" />
@@ -301,11 +302,7 @@
 		<Unit filename="..\..\plugins\jhexen\include\r_defs.h" />
 		<Unit filename="..\..\plugins\jhexen\include\r_local.h" />
 		<Unit filename="..\..\plugins\jhexen\include\s_sequence.h" />
-		<Unit filename="..\..\plugins\jhexen\include\s_sound.h" />
 		<Unit filename="..\..\plugins\jhexen\include\sc_man.h" />
-		<Unit filename="..\..\plugins\jhexen\include\sn_sonix.h" />
-		<Unit filename="..\..\plugins\jhexen\include\sounds.h" />
-		<Unit filename="..\..\plugins\jhexen\include\soundst.h" />
 		<Unit filename="..\..\plugins\jhexen\include\st_stuff.h" />
 		<Unit filename="..\..\plugins\jhexen\include\textdefs.h" />
 		<Unit filename="..\..\plugins\jhexen\include\version.h" />
@@ -380,6 +377,9 @@
 		<Unit filename="..\..\plugins\jhexen\src\p_setup.c">
 			<Option compilerVar="CC" />
 		</Unit>
+		<Unit filename="..\..\plugins\jhexen\src\p_sound.c">
+			<Option compilerVar="CC" />
+		</Unit>
 		<Unit filename="..\..\plugins\jhexen\src\p_spec.c">
 			<Option compilerVar="CC" />
 		</Unit>
@@ -395,9 +395,6 @@
 		<Unit filename="..\..\plugins\jhexen\src\po_man.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\..\plugins\jhexen\src\s_sound.c">
-			<Option compilerVar="CC" />
-		</Unit>
 		<Unit filename="..\..\plugins\jhexen\src\sc_man.c">
 			<Option compilerVar="CC" />
 		</Unit>

diff --git a/doomsday/build/win32/jhexen_cl.rsp b/doomsday/build/win32/jhexen_cl.rsp
@@ -47,6 +47,7 @@
  ./../../plugins/jhexen/src/h2_main.c
  ./../../plugins/jhexen/src/p_things.c
  ./../../plugins/jhexen/src/p_telept.c
+ ./../../plugins/jhexen/src/p_sound.c
  ./../../plugins/jhexen/src/p_spec.c
  ./../../plugins/jhexen/src/p_setup.c
  ./../../plugins/jhexen/src/p_pillar.c
@@ -60,7 +61,6 @@
  ./../../plugins/jhexen/src/p_anim.c
  ./../../plugins/jhexen/src/p_acs.c
  ./../../plugins/jhexen/src/p_waggle.c
- ./../../plugins/jhexen/src/s_sound.c
  ./../../plugins/jhexen/src/m_cheat.c
  ./../../plugins/jhexen/src/tables.c
  ./../../plugins/jhexen/src/sn_sonix.c

diff --git a/doomsday/build/win32/vs8/jdoom.vcproj b/doomsday/build/win32/vs8/jdoom.vcproj
@@ -739,14 +739,6 @@
 				RelativePath="..\..\..\plugins\jdoom\include\r_defs.h"
 				>
 			</File>
-			<File
-				RelativePath="..\..\..\plugins\jdoom\include\s_sound.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\plugins\jdoom\include\sndidx.h"
-				>
-			</File>
 			<File
 				RelativePath="..\..\..\plugins\jdoom\include\st_stuff.h"
 				>

diff --git a/doomsday/build/win32/vs8/jdoom64.vcproj b/doomsday/build/win32/vs8/jdoom64.vcproj
@@ -719,10 +719,6 @@
 				RelativePath="..\..\..\plugins\jdoom64\include\r_defs.h"
 				>
 			</File>
-			<File
-				RelativePath="..\..\..\plugins\jdoom64\include\sndidx.h"
-				>
-			</File>
 			<File
 				RelativePath="..\..\..\plugins\jdoom64\include\st_stuff.h"
 				>

diff --git a/doomsday/build/win32/vs8/jheretic.vcproj b/doomsday/build/win32/vs8/jheretic.vcproj
@@ -752,14 +752,6 @@
 				RelativePath="..\..\..\plugins\jheretic\include\resource.h"
 				>
 			</File>
-			<File
-				RelativePath="..\..\..\plugins\jheretic\include\sounds.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\plugins\jheretic\include\soundst.h"
-				>
-			</File>
 			<File
 				RelativePath="..\..\..\plugins\jheretic\include\st_stuff.h"
 				>

diff --git a/doomsday/build/win32/vs8/jhexen.vcproj b/doomsday/build/win32/vs8/jhexen.vcproj
@@ -692,6 +692,10 @@
 				RelativePath="..\..\..\plugins\jhexen\include\p_setup.h"
 				>
 			</File>
+			<File
+				RelativePath="..\..\..\plugins\jhexen\include\p_sound.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\..\plugins\jhexen\include\p_spec.h"
 				>
@@ -724,26 +728,10 @@
 				RelativePath="..\..\..\plugins\jhexen\include\s_sequence.h"
 				>
 			</File>
-			<File
-				RelativePath="..\..\..\plugins\jhexen\include\s_sound.h"
-				>
-			</File>
 			<File
 				RelativePath="..\..\..\plugins\jhexen\include\sc_man.h"
 				>
 			</File>
-			<File
-				RelativePath="..\..\..\plugins\jhexen\include\sn_sonix.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\plugins\jhexen\include\sounds.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\plugins\jhexen\include\soundst.h"
-				>
-			</File>
 			<File
 				RelativePath="..\..\..\plugins\jhexen\include\st_stuff.h"
 				>
@@ -892,6 +880,10 @@
 				RelativePath="..\..\..\plugins\jhexen\src\p_setup.c"
 				>
 			</File>
+			<File
+				RelativePath="..\..\..\plugins\jhexen\src\p_sound.c"
+				>
+			</File>
 			<File
 				RelativePath="..\..\..\plugins\jhexen\src\p_spec.c"
 				>
@@ -912,10 +904,6 @@
 				RelativePath="..\..\..\plugins\jhexen\src\po_man.c"
 				>
 			</File>
-			<File
-				RelativePath="..\..\..\plugins\jhexen\src\s_sound.c"
-				>
-			</File>
 			<File
 				RelativePath="..\..\..\plugins\jhexen\src\sc_man.c"
 				>

diff --git a/doomsday/plugins/jdoom/include/info.h b/doomsday/plugins/jdoom/include/info.h
@@ -23,11 +23,11 @@
  */
 
 /**
- * info.h: Sprite, state, mobjtype and text identifiers.
+ * info.h: Sprite, state, mobjtype, text, sfx and music identifiers.
  */
 
-#ifndef __INFO_H__
-#define __INFO_H__
+#ifndef __JDOOM_INFO_H__
+#define __JDOOM_INFO_H__
 
 #ifndef __JDOOM__
 #  error "Using jDoom headers without __JDOOM__"
@@ -1675,4 +1675,196 @@ typedef enum {
     NUMTEXT
 } textenum_t;
 
+// Sounds.
+typedef enum {
+    SFX_NONE,
+    SFX_PISTOL,
+    SFX_SHOTGN,
+    SFX_SGCOCK,
+    SFX_DSHTGN,
+    SFX_DBOPN,
+    SFX_DBCLS,
+    SFX_DBLOAD,
+    SFX_PLASMA,
+    SFX_BFG,
+    SFX_SAWUP,
+    SFX_SAWIDL,
+    SFX_SAWFUL,
+    SFX_SAWHIT,
+    SFX_RLAUNC,
+    SFX_RXPLOD,
+    SFX_FIRSHT,
+    SFX_FIRXPL,
+    SFX_PSTART,
+    SFX_PSTOP,
+    SFX_DOROPN,
+    SFX_DORCLS,
+    SFX_STNMOV,
+    SFX_SWTCHN,
+    SFX_SWTCHX,
+    SFX_PLPAIN,
+    SFX_DMPAIN,
+    SFX_POPAIN,
+    SFX_VIPAIN,
+    SFX_MNPAIN,
+    SFX_PEPAIN,
+    SFX_SLOP,
+    SFX_ITEMUP,
+    SFX_WPNUP,
+    SFX_OOF,
+    SFX_TELEPT,
+    SFX_POSIT1,
+    SFX_POSIT2,
+    SFX_POSIT3,
+    SFX_BGSIT1,
+    SFX_BGSIT2,
+    SFX_SGTSIT,
+    SFX_CACSIT,
+    SFX_BRSSIT,
+    SFX_CYBSIT,
+    SFX_SPISIT,
+    SFX_BSPSIT,
+    SFX_KNTSIT,
+    SFX_VILSIT,
+    SFX_MANSIT,
+    SFX_PESIT,
+    SFX_SKLATK,
+    SFX_SGTATK,
+    SFX_SKEPCH,
+    SFX_VILATK,
+    SFX_CLAW,
+    SFX_SKESWG,
+    SFX_PLDETH,
+    SFX_PDIEHI,
+    SFX_PODTH1,
+    SFX_PODTH2,
+    SFX_PODTH3,
+    SFX_BGDTH1,
+    SFX_BGDTH2,
+    SFX_SGTDTH,
+    SFX_CACDTH,
+    SFX_SKLDTH,
+    SFX_BRSDTH,
+    SFX_CYBDTH,
+    SFX_SPIDTH,
+    SFX_BSPDTH,
+    SFX_VILDTH,
+    SFX_KNTDTH,
+    SFX_PEDTH,
+    SFX_SKEDTH,
+    SFX_POSACT,
+    SFX_BGACT,
+    SFX_DMACT,
+    SFX_BSPACT,
+    SFX_BSPWLK,
+    SFX_VILACT,
+    SFX_NOWAY,
+    SFX_BAREXP,
+    SFX_PUNCH,
+    SFX_HOOF,
+    SFX_METAL,
+    SFX_CHGUN,
+    SFX_TINK,
+    SFX_BDOPN,
+    SFX_BDCLS,
+    SFX_ITMBK,
+    SFX_FLAME,
+    SFX_FLAMST,
+    SFX_GETPOW,
+    SFX_BOSPIT,
+    SFX_BOSCUB,
+    SFX_BOSSIT,
+    SFX_BOSPN,
+    SFX_BOSDTH,
+    SFX_MANATK,
+    SFX_MANDTH,
+    SFX_SSSIT,
+    SFX_SSDTH,
+    SFX_KEENPN,
+    SFX_KEENDT,
+    SFX_SKEACT,
+    SFX_SKESIT,
+    SFX_SKEATK,
+    SFX_RADIO,
+    SFX_WSPLASH,
+    SFX_NSPLASH,
+    SFX_BLURB,
+    NUMSFX
+} sfxenum_t;
+
+/**
+ * Music.
+ * These ids are no longer used. All tracks are played by ident.
+  typedef enum {
+    MUS_NONE,
+    MUS_E1M1,
+    MUS_E1M2,
+    MUS_E1M3,
+    MUS_E1M4,
+    MUS_E1M5,
+    MUS_E1M6,
+    MUS_E1M7,
+    MUS_E1M8,
+    MUS_E1M9,
+    MUS_E2M1,
+    MUS_E2M2,
+    MUS_E2M3,
+    MUS_E2M4,
+    MUS_E2M5,
+    MUS_E2M6,
+    MUS_E2M7,
+    MUS_E2M8,
+    MUS_E2M9,
+    MUS_E3M1,
+    MUS_E3M2,
+    MUS_E3M3,
+    MUS_E3M4,
+    MUS_E3M5,
+    MUS_E3M6,
+    MUS_E3M7,
+    MUS_E3M8,
+    MUS_E3M9,
+    MUS_INTER,
+    MUS_INTRO,
+    MUS_BUNNY,
+    MUS_VICTOR,
+    MUS_INTROA,
+    MUS_RUNNIN,
+    MUS_STALKS,
+    MUS_COUNTD,
+    MUS_BETWEE,
+    MUS_DOOM,
+    MUS_THE_DA,
+    MUS_SHAWN,
+    MUS_DDTBLU,
+    MUS_IN_CIT,
+    MUS_DEAD,
+    MUS_STLKS2,
+    MUS_THEDA2,
+    MUS_DOOM2,
+    MUS_DDTBL2,
+    MUS_RUNNI2,
+    MUS_DEAD2,
+    MUS_STLKS3,
+    MUS_ROMERO,
+    MUS_SHAWN2,
+    MUS_MESSAG,
+    MUS_COUNT2,
+    MUS_DDTBL3,
+    MUS_AMPIE,
+    MUS_THEDA3,
+    MUS_ADRIAN,
+    MUS_MESSG2,
+    MUS_ROMER2,
+    MUS_TENSE,
+    MUS_SHAWN3,
+    MUS_OPENIN,
+    MUS_EVIL,
+    MUS_ULTIMA,
+    MUS_READ_M,
+    MUS_DM2TTL,
+    MUS_DM2INT,
+    NUMMUSIC
+} musicenum_t; */
+
 #endif