ref: a12936c5120110c9dc786581cac43e86efe21ba9
parent: 2c0d5e026f50ae4f2a069b882a598e9a8a4d553b
author: Konstantinn Bonnet <[email protected]>
date: Sun Feb 21 12:33:32 EST 2016
audio: partial removal of version defs bullshit - one binary for all, assuming wl6 by default, change via arg(2) - this currently further breaks everything since name collisions are not handled; file loading will be done first
--- /dev/null
+++ b/audio.h
@@ -1,0 +1,206 @@
+/*#define UPLOAD*/ /* wolf3d demo */
+/*#define SPEAR*/ /* sod */
+/*#define SPEARDEMO*/ /* sod demo, needs SPEAR defined */
+
+typedef enum{+ /* wl? sfx */
+ HITWALLSND,
+ SELECTWPNSND,
+ SELECTITEMSND,
+ HEARTBEATSND,
+ MOVEGUN2SND,
+ MOVEGUN1SND,
+ NOWAYSND,
+ NAZIHITPLAYERSND,
+ SCHABBSTHROWSND,
+ PLAYERDEATHSND,
+ DOGDEATHSND,
+ ATKGATLINGSND,
+ GETKEYSND,
+ NOITEMSND,
+ WALK1SND,
+ WALK2SND,
+ TAKEDAMAGESND,
+ GAMEOVERSND,
+ OPENDOORSND,
+ CLOSEDOORSND,
+ DONOTHINGSND,
+ HALTSND,
+ DEATHSCREAM2SND,
+ ATKKNIFESND,
+ ATKPISTOLSND,
+ DEATHSCREAM3SND,
+ ATKMACHINEGUNSND,
+ HITENEMYSND,
+ SHOOTDOORSND,
+ DEATHSCREAM1SND,
+ GETMACHINESND,
+ GETAMMOSND,
+ SHOOTSND,
+ HEALTH1SND,
+ HEALTH2SND,
+ BONUS1SND,
+ BONUS2SND,
+ BONUS3SND,
+ GETGATLINGSND,
+ ESCPRESSEDSND,
+ LEVELDONESND,
+ DOGBARKSND,
+ ENDBONUS1SND,
+ ENDBONUS2SND,
+ BONUS1UPSND,
+ BONUS4SND,
+ PUSHWALLSND,
+ NOBONUSSND,
+ PERCENT100SND,
+ BOSSACTIVESND,
+ MUTTISND,
+ SCHUTZADSND,
+ AHHHGSND,
+ DIESND,
+ EVASND,
+ GUTENTAGSND,
+ LEBENSND,
+ SCHEISTSND,
+ NAZIFIRESND,
+ BOSSFIRESND,
+ SSFIRESND,
+ SLURPIESND,
+ TOT_HUNDSND,
+ MEINGOTTSND,
+ SCHABBSHASND,
+ HITLERHASND,
+ SPIONSND,
+ NEINSOVASSND,
+ DOGATTACKSND,
+ FLAMETHROWERSND,
+ MECHSTEPSND,
+ GOOBSSND,
+ YEAHSND,
+ DEATHSCREAM4SND,
+ DEATHSCREAM5SND,
+ DEATHSCREAM6SND,
+ DEATHSCREAM7SND,
+ DEATHSCREAM8SND,
+ DEATHSCREAM9SND,
+ DONNERSND,
+ EINESND,
+ ERLAUBENSND,
+ KEINSND,
+ MEINSND,
+ ROSESND,
+ MISSILEFIRESND,
+ MISSILEHITSND,
+ SEND,
+
+ /* wl1 specific */
+ NAZIMISSSND = SCHABBSTHROWSND,
+ BOSSDIESSND = MUTTISND,
+ MUTTI1SND = SCHEISTSND,
+ S1END = FLAMETHROWERSND,
+
+ /* sod specific */
+ MISSILEHITSSND = SELECTWPNSND,
+ GHOSTSIGHTSND = HEARTBEATSND,
+ MISSILEFIRESSND = SCHABBSTHROWSND,
+ DEATHSCREAM4SSND = MUTTISND,
+ DEATHSCREAM5SSND = DIESND,
+ DEATHSCREAM7SSND = EVASND,
+ DEATHSCREAM8SSND = GUTENTAGSND,
+ DEATHSCREAM6SSND = SCHEISTSND,
+ GHOSTFADESND = TOT_HUNDSND,
+ DEATHSCREAM9SSND = MEINGOTTSND,
+ GETAMMOBOXSND = SCHABBSHASND,
+ ANGELSIGHTSND = HITLERHASND,
+ ANGELFIRESND = FLAMETHROWERSND,
+ TRANSSIGHTSND = MECHSTEPSND,
+ TRANSDEATHSND = GOOBSSND,
+ WILHELMSIGHTSND = YEAHSND,
+ WILHELMDEATHSND = DEATHSCREAM4SND,
+ UBERDEATHSND = DEATHSCREAM5SND,
+ KNIGHTSIGHTSND = DEATHSCREAM6SND,
+ KNIGHTDEATHSND = DEATHSCREAM7SND,
+ ANGELDEATHSND = DEATHSCREAM8SND,
+ KNIGHTMISSILESND = DEATHSCREAM9SND,
+ GETSPEARSND = DONNERSND,
+ ANGELTIREDSND = EINESND,
+ SSEND = ERLAUBENSND
+}soundnames;
+
+typedef enum{+ /* wl? imf */
+ CORNER_MUS,
+ DUNGEON_MUS,
+ WARMARCH_MUS,
+ GETTHEM_MUS,
+ HEADACHE_MUS,
+ HITLWLTZ_MUS,
+ INTROCW3_MUS,
+ NAZI_NOR_MUS,
+ NAZI_OMI_MUS,
+ POW_MUS,
+ SALUTE_MUS,
+ SEARCHN_MUS,
+ SUSPENSE_MUS,
+ VICTORS_MUS,
+ WONDERIN_MUS,
+ FUNKYOU_MUS,
+ ENDLEVEL_MUS,
+ GOINGAFT_MUS,
+ PREGNANT_MUS,
+ ULTIMATE_MUS,
+ NAZI_RAP_MUS,
+ ZEROHOUR_MUS,
+ TWELFTH_MUS,
+ ROSTER_MUS,
+ URAHERO_MUS,
+ VICMARCH_MUS,
+ PACMAN_MUS,
+ MEND,
+
+ /* wl1 specific */
+ GETOUT_MUS = WARMARCH_MUS,
+ WARMRCH1_MUS = PACMAN_MUS,
+ M1END = MEND,
+
+ /* sod specific */
+ XFUNKIE_MUS = CORNER_MUS,
+ XDEATH_MUS = WARMARCH_MUS,
+ XTIPTOE_MUS = HEADACHE_MUS,
+ GOINGAFTS_MUS = HITLWLTZ_MUS,
+ URAHEROS_MUS = INTROCW3_MUS,
+ XTHEEND_MUS = NAZI_NOR_MUS,
+ TWELFTHS_MUS = SALUTE_MUS,
+ ZEROHOURS_MUS = VICTORS_MUS,
+ ULTIMATES_MUS = FUNKYOU_MUS,
+ XEVIL_MUS = GOINGAFT_MUS,
+ XJAZNAZI_MUS = PREGNANT_MUS,
+ COPYPRO_MUS = ULTIMATE_MUS,
+ XAWARD_MUS = NAZI_RAP_MUS,
+ XPUTIT_MUS = ZEROHOUR_MUS,
+ XGETYOU_MUS = TWELFTH_MUS,
+ XTOWER2_MUS = ROSTER_MUS,
+ MSEND = URAHERO_MUS
+}musicnames;
+
+enum{+#ifdef SPEAR
+ LASTSOUND = SSEND,
+ LASTMUSIC = MSEND,
+#endif
+#ifdef UPLOAD
+ LASTSOUND = S1END,
+ LASTMUSIC = M1END,
+#endif
+#ifndef SPEAR
+#ifndef UPLOAD
+ LASTSOUND = SEND,
+ LASTMUSIC = MEND,
+#endif
+#endif
+ STARTPCSOUNDS = 0,
+ STARTADLIBSOUNDS = LASTSOUND,
+ STARTMUSIC = LASTSOUND * 3,
+ NUMSOUNDS = LASTSOUND,
+ NUMSNDCHUNKS = STARTMUSIC + LASTMUSIC
+};
--- a/audiosdm.h
+++ /dev/null
@@ -1,142 +1,0 @@
-/////////////////////////////////////////////////
-//
-// MUSE Header for .SDM
-// Created Thu Aug 27 07:12:39 1992
-//
-/////////////////////////////////////////////////
-
-#define NUMSOUNDS 81
-#define NUMSNDCHUNKS 267
-
-//
-// Sound names & indexes
-//
-typedef enum {- HITWALLSND, // 0
- MISSILEHITSND, // 1
- SELECTITEMSND, // 2
- GHOSTSIGHTSND, // 3
- MOVEGUN2SND, // 4
- MOVEGUN1SND, // 5
- NOWAYSND, // 6
- NAZIHITPLAYERSND, // 7
- MISSILEFIRESND, // 8
- PLAYERDEATHSND, // 9
- DOGDEATHSND, // 10
- ATKGATLINGSND, // 11
- GETKEYSND, // 12
- NOITEMSND, // 13
- WALK1SND, // 14
- WALK2SND, // 15
- TAKEDAMAGESND, // 16
- GAMEOVERSND, // 17
- OPENDOORSND, // 18
- CLOSEDOORSND, // 19
- DONOTHINGSND, // 20
- HALTSND, // 21
- DEATHSCREAM2SND, // 22
- ATKKNIFESND, // 23
- ATKPISTOLSND, // 24
- DEATHSCREAM3SND, // 25
- ATKMACHINEGUNSND, // 26
- HITENEMYSND, // 27
- SHOOTDOORSND, // 28
- DEATHSCREAM1SND, // 29
- GETMACHINESND, // 30
- GETAMMOSND, // 31
- SHOOTSND, // 32
- HEALTH1SND, // 33
- HEALTH2SND, // 34
- BONUS1SND, // 35
- BONUS2SND, // 36
- BONUS3SND, // 37
- GETGATLINGSND, // 38
- ESCPRESSEDSND, // 39
- LEVELDONESND, // 40
- DOGBARKSND, // 41
- ENDBONUS1SND, // 42
- ENDBONUS2SND, // 43
- BONUS1UPSND, // 44
- BONUS4SND, // 45
- PUSHWALLSND, // 46
- NOBONUSSND, // 47
- PERCENT100SND, // 48
- BOSSACTIVESND, // 49
- DEATHSCREAM4SND, // 50
- SCHUTZADSND, // 51
- AHHHGSND, // 52
- DEATHSCREAM5SND, // 53
- DEATHSCREAM7SND, // 54
- DEATHSCREAM8SND, // 55
- LEBENSND, // 56
- DEATHSCREAM6SND, // 57
- NAZIFIRESND, // 58
- BOSSFIRESND, // 59
- SSFIRESND, // 60
- SLURPIESND, // 61
- GHOSTFADESND, // 62
- DEATHSCREAM9SND, // 63
- GETAMMOBOXSND, // 64
- ANGELSIGHTSND, // 65
- SPIONSND, // 66
- NEINSOVASSND, // 67
- DOGATTACKSND, // 68
- ANGELFIRESND, // 69
- TRANSSIGHTSND, // 70
- TRANSDEATHSND, // 71
- WILHELMSIGHTSND, // 72
- WILHELMDEATHSND, // 73
- UBERDEATHSND, // 74
- KNIGHTSIGHTSND, // 75
- KNIGHTDEATHSND, // 76
- ANGELDEATHSND, // 77
- KNIGHTMISSILESND, // 78
- GETSPEARSND, // 79
- ANGELTIREDSND, // 80
- LASTSOUND
- } soundnames;
-
-//
-// Base offsets
-//
-#define STARTPCSOUNDS 0
-#define STARTADLIBSOUNDS 81
-#define STARTDIGISOUNDS 162
-#define STARTMUSIC 243
-
-//
-// Music names & indexes
-//
-typedef enum {- XFUNKIE_MUS, // 0
- DUNGEON_MUS, // 1
- XDEATH_MUS, // 2
- GETTHEM_MUS, // 3
- XTIPTOE_MUS, // 4
- GOINGAFT_MUS, // 5
- URAHERO_MUS, // 6
- XTHEEND_MUS, // 7
- NAZI_OMI_MUS, // 8
- POW_MUS, // 9
- TWELFTH_MUS, // 10
- SEARCHN_MUS, // 11
- SUSPENSE_MUS, // 12
- ZEROHOUR_MUS, // 13
- WONDERIN_MUS, // 14
- ULTIMATE_MUS, // 15
- ENDLEVEL_MUS, // 16
- XEVIL_MUS, // 17
- XJAZNAZI_MUS, // 18
- COPYPRO_MUS, // 19
- XAWARD_MUS, // 20
- XPUTIT_MUS, // 21
- XGETYOU_MUS, // 22
- XTOWER2_MUS, // 23
- LASTMUSIC
- } musicnames;
-
-/////////////////////////////////////////////////
-//
-// Thanks for playing with MUSE!
-//
-/////////////////////////////////////////////////
--- a/audiosod.h
+++ /dev/null
@@ -1,142 +1,0 @@
-/////////////////////////////////////////////////
-//
-// MUSE Header for .SOD
-// Created Thu Aug 13 09:25:58 1992
-//
-/////////////////////////////////////////////////
-
-#define NUMSOUNDS 81
-#define NUMSNDCHUNKS 267
-
-//
-// Sound names & indexes
-//
-typedef enum {- HITWALLSND, // 0
- MISSILEHITSND, // 1
- SELECTITEMSND, // 2
- GHOSTSIGHTSND, // 3
- MOVEGUN2SND, // 4
- MOVEGUN1SND, // 5
- NOWAYSND, // 6
- NAZIHITPLAYERSND, // 7
- MISSILEFIRESND, // 8
- PLAYERDEATHSND, // 9
- DOGDEATHSND, // 10
- ATKGATLINGSND, // 11
- GETKEYSND, // 12
- NOITEMSND, // 13
- WALK1SND, // 14
- WALK2SND, // 15
- TAKEDAMAGESND, // 16
- GAMEOVERSND, // 17
- OPENDOORSND, // 18
- CLOSEDOORSND, // 19
- DONOTHINGSND, // 20
- HALTSND, // 21
- DEATHSCREAM2SND, // 22
- ATKKNIFESND, // 23
- ATKPISTOLSND, // 24
- DEATHSCREAM3SND, // 25
- ATKMACHINEGUNSND, // 26
- HITENEMYSND, // 27
- SHOOTDOORSND, // 28
- DEATHSCREAM1SND, // 29
- GETMACHINESND, // 30
- GETAMMOSND, // 31
- SHOOTSND, // 32
- HEALTH1SND, // 33
- HEALTH2SND, // 34
- BONUS1SND, // 35
- BONUS2SND, // 36
- BONUS3SND, // 37
- GETGATLINGSND, // 38
- ESCPRESSEDSND, // 39
- LEVELDONESND, // 40
- DOGBARKSND, // 41
- ENDBONUS1SND, // 42
- ENDBONUS2SND, // 43
- BONUS1UPSND, // 44
- BONUS4SND, // 45
- PUSHWALLSND, // 46
- NOBONUSSND, // 47
- PERCENT100SND, // 48
- BOSSACTIVESND, // 49
- DEATHSCREAM4SND, // 50
- SCHUTZADSND, // 51
- AHHHGSND, // 52
- DEATHSCREAM5SND, // 53
- DEATHSCREAM7SND, // 54
- DEATHSCREAM8SND, // 55
- LEBENSND, // 56
- DEATHSCREAM6SND, // 57
- NAZIFIRESND, // 58
- BOSSFIRESND, // 59
- SSFIRESND, // 60
- SLURPIESND, // 61
- GHOSTFADESND, // 62
- DEATHSCREAM9SND, // 63
- GETAMMOBOXSND, // 64
- ANGELSIGHTSND, // 65
- SPIONSND, // 66
- NEINSOVASSND, // 67
- DOGATTACKSND, // 68
- ANGELFIRESND, // 69
- TRANSSIGHTSND, // 70
- TRANSDEATHSND, // 71
- WILHELMSIGHTSND, // 72
- WILHELMDEATHSND, // 73
- UBERDEATHSND, // 74
- KNIGHTSIGHTSND, // 75
- KNIGHTDEATHSND, // 76
- ANGELDEATHSND, // 77
- KNIGHTMISSILESND, // 78
- GETSPEARSND, // 79
- ANGELTIREDSND, // 80
- LASTSOUND
- } soundnames;
-
-//
-// Base offsets
-//
-#define STARTPCSOUNDS 0
-#define STARTADLIBSOUNDS 81
-#define STARTDIGISOUNDS 162
-#define STARTMUSIC 243
-
-//
-// Music names & indexes
-//
-typedef enum {- XFUNKIE_MUS, // 0
- DUNGEON_MUS, // 1
- XDEATH_MUS, // 2
- GETTHEM_MUS, // 3
- XTIPTOE_MUS, // 4
- GOINGAFT_MUS, // 5
- URAHERO_MUS, // 6
- XTHEEND_MUS, // 7
- NAZI_OMI_MUS, // 8
- POW_MUS, // 9
- TWELFTH_MUS, // 10
- SEARCHN_MUS, // 11
- SUSPENSE_MUS, // 12
- ZEROHOUR_MUS, // 13
- WONDERIN_MUS, // 14
- ULTIMATE_MUS, // 15
- ENDLEVEL_MUS, // 16
- XEVIL_MUS, // 17
- XJAZNAZI_MUS, // 18
- COPYPRO_MUS, // 19
- XAWARD_MUS, // 20
- XPUTIT_MUS, // 21
- XGETYOU_MUS, // 22
- XTOWER2_MUS, // 23
- LASTMUSIC
- } musicnames;
-
-/////////////////////////////////////////////////
-//
-// Thanks for playing with MUSE!
-//
-/////////////////////////////////////////////////
--- a/audiowl1.h
+++ /dev/null
@@ -1,133 +1,0 @@
-/////////////////////////////////////////////////
-//
-// MUSE Header for .WL1
-// Created Tue Apr 28 23:57:08 1992
-//
-/////////////////////////////////////////////////
-
-#define NUMSOUNDS 69
-#define NUMSNDCHUNKS 234
-
-//
-// Sound names & indexes
-//
-typedef enum {- HITWALLSND, // 0
- SELECTWPNSND, // 1
- SELECTITEMSND, // 2
- HEARTBEATSND, // 3
- MOVEGUN2SND, // 4
- MOVEGUN1SND, // 5
- NOWAYSND, // 6
- NAZIHITPLAYERSND, // 7
- NAZIMISSSND, // 8
- PLAYERDEATHSND, // 9
- DOGDEATHSND, // 10
- ATKGATLINGSND, // 11
- GETKEYSND, // 12
- NOITEMSND, // 13
- WALK1SND, // 14
- WALK2SND, // 15
- TAKEDAMAGESND, // 16
- GAMEOVERSND, // 17
- OPENDOORSND, // 18
- CLOSEDOORSND, // 19
- DONOTHINGSND, // 20
- HALTSND, // 21
- DEATHSCREAM2SND, // 22
- ATKKNIFESND, // 23
- ATKPISTOLSND, // 24
- DEATHSCREAM3SND, // 25
- ATKMACHINEGUNSND, // 26
- HITENEMYSND, // 27
- SHOOTDOORSND, // 28
- DEATHSCREAM1SND, // 29
- GETMACHINESND, // 30
- GETAMMOSND, // 31
- SHOOTSND, // 32
- HEALTH1SND, // 33
- HEALTH2SND, // 34
- BONUS1SND, // 35
- BONUS2SND, // 36
- BONUS3SND, // 37
- GETGATLINGSND, // 38
- ESCPRESSEDSND, // 39
- LEVELDONESND, // 40
- DOGBARKSND, // 41
- ENDBONUS1SND, // 42
- ENDBONUS2SND, // 43
- BONUS1UPSND, // 44
- BONUS4SND, // 45
- PUSHWALLSND, // 46
- NOBONUSSND, // 47
- PERCENT100SND, // 48
- BOSSACTIVESND, // 49
- BOSSDIESSND, // 50
- SCHUTZADSND, // 51
- AHHHGSND, // 52
- DIESND, // 53
- EVASND, // 54
- GUTENTAGSND, // 55
- LEBENSND, // 56
- MUTTISND, // 57
- NAZIFIRESND, // 58
- BOSSFIRESND, // 59
- SSFIRESND, // 60
- SLURPIESND, // 61
- TOT_HUNDSND, // 62
- MEINGOTTSND, // 63
- SCHABBSHASND, // 64
- HILTERHASND, // 65
- SPIONSND, // 66
- NEINSOVASSND, // 67
- DOGATTACKSND, // 68
- LASTSOUND
- } soundnames;
-
-//
-// Base offsets
-//
-#define STARTPCSOUNDS 0
-#define STARTADLIBSOUNDS 69
-#define STARTDIGISOUNDS 138
-#define STARTMUSIC 207
-
-//
-// Music names & indexes
-//
-typedef enum {- CORNER_MUS, // 0
- DUNGEON_MUS, // 1
- GETOUT_MUS, // 2
- GETTHEM_MUS, // 3
- HEADACHE_MUS, // 4
- HITLWLTZ_MUS, // 5
- INTROCW3_MUS, // 6
- NAZI_NOR_MUS, // 7
- NAZI_OMI_MUS, // 8
- POW_MUS, // 9
- SALUTE_MUS, // 10
- SEARCHN_MUS, // 11
- SUSPENSE_MUS, // 12
- VICTORS_MUS, // 13
- WONDERIN_MUS, // 14
- FUNKYOU_MUS, // 15
- ENDLEVEL_MUS, // 16
- GOINGAFT_MUS, // 17
- PREGNANT_MUS, // 18
- ULTIMATE_MUS, // 19
- NAZI_RAP_MUS, // 20
- ZEROHOUR_MUS, // 21
- TWELFTH_MUS, // 22
- ROSTER_MUS, // 23
- URAHERO_MUS, // 24
- VICMARCH_MUS, // 25
- WARMRCH1_MUS, // 26
- LASTMUSIC
- } musicnames;
-
-/////////////////////////////////////////////////
-//
-// Thanks for playing with MUSE!
-//
-/////////////////////////////////////////////////
--- a/audiowl6.h
+++ /dev/null
@@ -1,151 +1,0 @@
-/////////////////////////////////////////////////
-//
-// MUSE Header for .WL6
-// Created Tue Jul 14 15:04:53 1992
-//
-/////////////////////////////////////////////////
-
-#define NUMSOUNDS 87
-#define NUMSNDCHUNKS 288
-
-//
-// Sound names & indexes
-//
-typedef enum {- HITWALLSND, // 0
- SELECTWPNSND, // 1
- SELECTITEMSND, // 2
- HEARTBEATSND, // 3
- MOVEGUN2SND, // 4
- MOVEGUN1SND, // 5
- NOWAYSND, // 6
- NAZIHITPLAYERSND, // 7
- SCHABBSTHROWSND, // 8
- PLAYERDEATHSND, // 9
- DOGDEATHSND, // 10
- ATKGATLINGSND, // 11
- GETKEYSND, // 12
- NOITEMSND, // 13
- WALK1SND, // 14
- WALK2SND, // 15
- TAKEDAMAGESND, // 16
- GAMEOVERSND, // 17
- OPENDOORSND, // 18
- CLOSEDOORSND, // 19
- DONOTHINGSND, // 20
- HALTSND, // 21
- DEATHSCREAM2SND, // 22
- ATKKNIFESND, // 23
- ATKPISTOLSND, // 24
- DEATHSCREAM3SND, // 25
- ATKMACHINEGUNSND, // 26
- HITENEMYSND, // 27
- SHOOTDOORSND, // 28
- DEATHSCREAM1SND, // 29
- GETMACHINESND, // 30
- GETAMMOSND, // 31
- SHOOTSND, // 32
- HEALTH1SND, // 33
- HEALTH2SND, // 34
- BONUS1SND, // 35
- BONUS2SND, // 36
- BONUS3SND, // 37
- GETGATLINGSND, // 38
- ESCPRESSEDSND, // 39
- LEVELDONESND, // 40
- DOGBARKSND, // 41
- ENDBONUS1SND, // 42
- ENDBONUS2SND, // 43
- BONUS1UPSND, // 44
- BONUS4SND, // 45
- PUSHWALLSND, // 46
- NOBONUSSND, // 47
- PERCENT100SND, // 48
- BOSSACTIVESND, // 49
- MUTTISND, // 50
- SCHUTZADSND, // 51
- AHHHGSND, // 52
- DIESND, // 53
- EVASND, // 54
- GUTENTAGSND, // 55
- LEBENSND, // 56
- SCHEISTSND, // 57
- NAZIFIRESND, // 58
- BOSSFIRESND, // 59
- SSFIRESND, // 60
- SLURPIESND, // 61
- TOT_HUNDSND, // 62
- MEINGOTTSND, // 63
- SCHABBSHASND, // 64
- HITLERHASND, // 65
- SPIONSND, // 66
- NEINSOVASSND, // 67
- DOGATTACKSND, // 68
- FLAMETHROWERSND, // 69
- MECHSTEPSND, // 70
- GOOBSSND, // 71
- YEAHSND, // 72
- DEATHSCREAM4SND, // 73
- DEATHSCREAM5SND, // 74
- DEATHSCREAM6SND, // 75
- DEATHSCREAM7SND, // 76
- DEATHSCREAM8SND, // 77
- DEATHSCREAM9SND, // 78
- DONNERSND, // 79
- EINESND, // 80
- ERLAUBENSND, // 81
- KEINSND, // 82
- MEINSND, // 83
- ROSESND, // 84
- MISSILEFIRESND, // 85
- MISSILEHITSND, // 86
- LASTSOUND
- } soundnames;
-
-//
-// Base offsets
-//
-#define STARTPCSOUNDS 0
-#define STARTADLIBSOUNDS 87
-#define STARTDIGISOUNDS 174
-#define STARTMUSIC 261
-
-//
-// Music names & indexes
-//
-typedef enum {- CORNER_MUS, // 0
- DUNGEON_MUS, // 1
- WARMARCH_MUS, // 2
- GETTHEM_MUS, // 3
- HEADACHE_MUS, // 4
- HITLWLTZ_MUS, // 5
- INTROCW3_MUS, // 6
- NAZI_NOR_MUS, // 7
- NAZI_OMI_MUS, // 8
- POW_MUS, // 9
- SALUTE_MUS, // 10
- SEARCHN_MUS, // 11
- SUSPENSE_MUS, // 12
- VICTORS_MUS, // 13
- WONDERIN_MUS, // 14
- FUNKYOU_MUS, // 15
- ENDLEVEL_MUS, // 16
- GOINGAFT_MUS, // 17
- PREGNANT_MUS, // 18
- ULTIMATE_MUS, // 19
- NAZI_RAP_MUS, // 20
- ZEROHOUR_MUS, // 21
- TWELFTH_MUS, // 22
- ROSTER_MUS, // 23
- URAHERO_MUS, // 24
- VICMARCH_MUS, // 25
- PACMAN_MUS, // 26
- LASTMUSIC
- } musicnames;
-
-/////////////////////////////////////////////////
-//
-// Thanks for playing with MUSE!
-//
-/////////////////////////////////////////////////
--- a/dat.h
+++ b/dat.h
@@ -1,5 +1,12 @@
typedef short s16int;
typedef int s32int;
+extern int sod;
+extern int sdm;
+extern int wl1;
+extern char *ext;
+
extern u32int pal[];
extern u8int intro[];
+
+#include "audio.h"
--- a/sdmver.h
+++ /dev/null
@@ -1,2 +1,0 @@
-#define SPEAR
-#define SPEARDEMO
--- a/sharemsg.h
+++ /dev/null
@@ -1,9 +1,0 @@
-"This game is shareware.\n"
-"Share it with everyone.\n"
-"Thanks.\n\n"
-" Id Software\n"
-
-"This game is NOT shareware.\n"
-"Please do not distribute it.\n"
-"Thanks.\n\n"
-" Id Software\n"
--- a/sodver.h
+++ /dev/null
@@ -1,1 +1,0 @@
-#define SPEAR
--- a/wolf1ver.h
+++ /dev/null
@@ -1,1 +1,0 @@
-#define UPLOAD