- merged the 3 sound related headers in Blood.

source/blood/src/actor.cpp

@@ -49,7 +49,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include "loadsave.h"
 #include "player.h"
 #include "seq.h"
-#include "sfx.h"
 #include "sound.h"
 #include "tile.h"
 #include "trig.h"

source/blood/src/ai.cpp

@@ -44,7 +44,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include "player.h"
 #include "seq.h"
 #include "sound.h"
-#include "sfx.h"
 #include "trig.h"
 #include "triggers.h"
 #include "view.h"

source/blood/src/aibeast.cpp

@@ -37,7 +37,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include "levels.h"
 #include "player.h"
 #include "seq.h"
-#include "sfx.h"
+#include "sound.h"
 #include "trig.h"
 
 BEGIN_BLD_NS

source/blood/src/aiboneel.cpp

@@ -36,7 +36,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include "levels.h"
 #include "player.h"
 #include "seq.h"
-#include "sfx.h"
+#include "sound.h"
 #include "trig.h"
 
 BEGIN_BLD_NS

source/blood/src/aiburn.cpp

@@ -38,7 +38,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include "levels.h"
 #include "player.h"
 #include "seq.h"
-#include "sfx.h"
+#include "sound.h"
 #include "trig.h"
 #include "nnexts.h"
 

source/blood/src/aicaleb.cpp

@@ -37,7 +37,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include "levels.h"
 #include "player.h"
 #include "seq.h"
-#include "sfx.h"
+#include "sound.h"
 #include "trig.h"
 
 BEGIN_BLD_NS

source/blood/src/aicerber.cpp

@@ -37,7 +37,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include "levels.h"
 #include "player.h"
 #include "seq.h"
-#include "sfx.h"
+#include "sound.h"
 #include "trig.h"
 
 BEGIN_BLD_NS

source/blood/src/aicult.cpp

@@ -39,7 +39,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include "levels.h"
 #include "player.h"
 #include "seq.h"
-#include "sfx.h"
+#include "sound.h"
 #include "trig.h"
 
 BEGIN_BLD_NS

source/blood/src/aigarg.cpp

@@ -39,7 +39,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include "levels.h"
 #include "player.h"
 #include "seq.h"
-#include "sfx.h"
+#include "sound.h"
 #include "trig.h"
 #include "nnexts.h"
 

source/blood/src/aighost.cpp

@@ -39,7 +39,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include "levels.h"
 #include "player.h"
 #include "seq.h"
-#include "sfx.h"
+#include "sound.h"
 #include "trig.h"
 #include "nnexts.h"
 

source/blood/src/aigilbst.cpp

@@ -38,7 +38,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include "levels.h"
 #include "player.h"
 #include "seq.h"
-#include "sfx.h"
+#include "sound.h"
 #include "trig.h"
 
 BEGIN_BLD_NS

source/blood/src/aihand.cpp

@@ -38,7 +38,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include "levels.h"
 #include "player.h"
 #include "seq.h"
-#include "sfx.h"
+#include "sound.h"
 #include "trig.h"
 
 BEGIN_BLD_NS

source/blood/src/aihound.cpp

@@ -39,7 +39,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include "levels.h"
 #include "player.h"
 #include "seq.h"
-#include "sfx.h"
+#include "sound.h"
 #include "trig.h"
 #include "nnexts.h"
 

source/blood/src/aiinnoc.cpp

@@ -38,7 +38,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include "levels.h"
 #include "player.h"
 #include "seq.h"
-#include "sfx.h"
+#include "sound.h"
 #include "trig.h"
 
 BEGIN_BLD_NS

source/blood/src/aipod.cpp

@@ -40,7 +40,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include "levels.h"
 #include "player.h"
 #include "seq.h"
-#include "sfx.h"
+#include "sound.h"
 #include "trig.h"
 
 BEGIN_BLD_NS

source/blood/src/airat.cpp

@@ -38,7 +38,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include "levels.h"
 #include "player.h"
 #include "seq.h"
-#include "sfx.h"
+#include "sound.h"
 #include "trig.h"
 
 BEGIN_BLD_NS

source/blood/src/aispid.cpp

@@ -39,7 +39,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include "levels.h"
 #include "player.h"
 #include "seq.h"
-#include "sfx.h"
+#include "sound.h"
 #include "trig.h"
 
 BEGIN_BLD_NS

source/blood/src/aitchern.cpp

@@ -39,7 +39,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include "levels.h"
 #include "player.h"
 #include "seq.h"
-#include "sfx.h"
+#include "sound.h"
 #include "trig.h"
 
 BEGIN_BLD_NS

source/blood/src/aiunicult.cpp

@@ -45,7 +45,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include "levels.h"
 #include "player.h"
 #include "seq.h"
-#include "sfx.h"
 #include "sound.h"
 #include "trig.h"
 #include "triggers.h"

source/blood/src/aizomba.cpp

@@ -39,7 +39,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include "levels.h"
 #include "player.h"
 #include "seq.h"
-#include "sfx.h"
+#include "sound.h"
 #include "trig.h"
 
 BEGIN_BLD_NS

source/blood/src/aizombf.cpp

@@ -38,7 +38,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include "levels.h"
 #include "player.h"
 #include "seq.h"
-#include "sfx.h"
+#include "sound.h"
 #include "trig.h"
 
 BEGIN_BLD_NS

source/blood/src/asound.h

@@ -1,31 +0,0 @@
-//-------------------------------------------------------------------------
-/*
-Copyright (C) 2010-2019 EDuke32 developers and contributors
-Copyright (C) 2019 Nuke.YKT
-
-This file is part of NBlood.
-
-NBlood is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License version 2
-as published by the Free Software Foundation.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-
-See the GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-*/
-//-------------------------------------------------------------------------
-#pragma once
-
-BEGIN_BLD_NS
-
-void ambProcess(void);
-void ambKillAll(void);
-void ambInit(void);
-
-END_BLD_NS

source/blood/src/blood.cpp

@@ -30,7 +30,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include "common.h"
 #include "common_game.h"
 
-#include "asound.h"
 #include "db.h"
 #include "blood.h"
 #include "choke.h"
@@ -57,7 +56,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include "screen.h"
 #include "sectorfx.h"
 #include "seq.h"
-#include "sfx.h"
 #include "sound.h"
 #include "tile.h"
 #include "trig.h"

source/blood/src/callback.cpp

@@ -40,7 +40,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include "levels.h"
 #include "player.h"
 #include "seq.h"
-#include "sfx.h"
 #include "sound.h"
 #include "trig.h"
 #include "triggers.h"

source/blood/src/d_menu.cpp

@@ -40,7 +40,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include "mmulti.h"
 #include "c_bind.h"
 #include "menu.h"
-#include "sfx.h"
+#include "sound.h"
 
 bool ShowOptionMenu();
 

source/blood/src/gib.cpp

@@ -36,7 +36,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include "fx.h"
 #include "gib.h"
 #include "levels.h"
-#include "sfx.h"
+#include "sound.h"
 #include "tile.h"
 #include "trig.h"
 

source/blood/src/levels.cpp

@@ -27,7 +27,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include "compat.h"
 #include "common_game.h"
 
-#include "asound.h"
 #include "blood.h"
 #include "config.h"
 #include "credits.h"
@@ -40,7 +39,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include "screen.h"
 #include "seq.h"
 #include "sound.h"
-#include "sfx.h"
 #include "view.h"
 #include "eventq.h"
 #include "menu.h"

source/blood/src/loadsave.cpp

@@ -29,7 +29,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include "common_game.h"
 #include "config.h"
 #include "ai.h"
-#include "asound.h"
 #include "blood.h"
 #include "demo.h"
 #include "globals.h"
@@ -42,7 +41,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include "screen.h"
 #include "sectorfx.h"
 #include "seq.h"
-#include "sfx.h"
 #include "sound.h"
 #include "i_specialpaths.h"
 #include "view.h"

source/blood/src/nnexts.cpp

@@ -43,7 +43,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include "view.h"
 #include "tile.h"
 #include "trig.h"
-#include "sfx.h"
+#include "sound.h"
 #include "seq.h"
 #include "ai.h"
 

source/blood/src/osdcmd.cpp

@@ -39,7 +39,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include "osdcmds.h"
 #include "screen.h"
 #include "sound.h"
-#include "sfx.h"
 #include "view.h"
 #include "mapinfo.h"
 

source/blood/src/player.cpp

@@ -43,7 +43,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include "network.h"
 #include "player.h"
 #include "seq.h"
-#include "sfx.h"
 #include "sound.h"
 #include "tile.h"
 #include "triggers.h"

source/blood/src/qav.cpp

@@ -27,7 +27,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include "common_game.h"
 #include "qav.h"
 #include "tile.h"
-#include "sfx.h"
 #include "sound.h"
 
 BEGIN_BLD_NS

source/blood/src/seq.cpp

@@ -32,7 +32,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include "globals.h"
 #include "levels.h"
 #include "loadsave.h"
-#include "sfx.h"
 #include "sound.h"
 #include "seq.h"
 #include "gameutil.h"

source/blood/src/sfx.cpp

@@ -31,7 +31,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include "gameutil.h"
 #include "player.h"
 #include "resource.h"
-#include "sfx.h"
 #include "sound.h"
 #include "trig.h"
 #include "raze_sound.h"

source/blood/src/sfx.h

@@ -1,58 +0,0 @@
-//-------------------------------------------------------------------------
-/*
-Copyright (C) 2010-2019 EDuke32 developers and contributors
-Copyright (C) 2019 Nuke.YKT
-
-This file is part of NBlood.
-
-NBlood is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License version 2
-as published by the Free Software Foundation.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-
-See the GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-*/
-//-------------------------------------------------------------------------
-#pragma once
-#include "db.h"
-
-BEGIN_BLD_NS
-
-#if 0
-struct BONKLE
-{
-    int left;
-    int right;
-    DICTNODE* data;
-    int soundId;
-    spritetype* origin;
-    int channel;
-    int pitch;
-    int relVol;
-    POINT3D originPt;
-    POINT3D oldOriginPt;
-};
-
-extern BONKLE Bonkle[256];
-extern BONKLE* BonkleCache[256];
-#endif
-
-void sfxInit(void);
-void sfxTerm(void);
-void sfxPlay3DSound(int x, int y, int z, int soundId, int nSector);
-void sfxPlay3DSound(spritetype *pSprite, int soundId, int a3 = -1, int a4 = 0);
-void sfxPlay3DSoundCP(spritetype* pSprite, int soundId, int a3 = -1, int a4 = 0, int pitch = 0, int volume = -1);
-void sfxKill3DSound(spritetype *pSprite, int a2 = -1, int a3 = -1);
-void sfxKillAllSounds(void);
-void sfxUpdate3DSounds(void);
-void sfxSetReverb(bool toggle);
-void sfxSetReverb2(bool toggle);
-
-END_BLD_NS

source/blood/src/sound.cpp

@@ -31,7 +31,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include "sound.h"
 #include "baselayer.h"
 #include "raze_music.h"
-#include "sfx.h"
 #include "raze_sound.h"
 
 BEGIN_BLD_NS

source/blood/src/sound.h

@@ -54,4 +54,19 @@ void sndProcess(void);
 void sndTerm(void);
 void sndInit(void);
 
+void sfxInit(void);
+void sfxTerm(void);
+void sfxPlay3DSound(int x, int y, int z, int soundId, int nSector);
+void sfxPlay3DSound(spritetype *pSprite, int soundId, int a3 = -1, int a4 = 0);
+void sfxPlay3DSoundCP(spritetype* pSprite, int soundId, int a3 = -1, int a4 = 0, int pitch = 0, int volume = -1);
+void sfxKill3DSound(spritetype *pSprite, int a2 = -1, int a3 = -1);
+void sfxKillAllSounds(void);
+void sfxUpdate3DSounds(void);
+void sfxSetReverb(bool toggle);
+void sfxSetReverb2(bool toggle);
+
+void ambProcess(void);
+void ambKillAll(void);
+void ambInit(void);
+
 END_BLD_NS

source/blood/src/triggers.cpp

@@ -45,7 +45,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include "player.h"
 #include "seq.h"
 #include "qav.h"
-#include "sfx.h"
 #include "sound.h"
 #include "triggers.h"
 #include "trig.h"

source/blood/src/weapon.cpp

@@ -44,7 +44,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include "qav.h"
 #include "resource.h"
 #include "seq.h"
-#include "sfx.h"
 #include "sound.h"
 #include "trig.h"
 #include "nnexts.h"