From ab9854a2151bb241700d8a8f3844aa0776a3a90f Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Sat, 25 Jul 2020 18:53:44 +0200 Subject: [PATCH] - merged the 3 sound related headers in Blood. --- source/blood/src/actor.cpp | 1 - source/blood/src/ai.cpp | 1 - source/blood/src/aibeast.cpp | 2 +- source/blood/src/aiboneel.cpp | 2 +- source/blood/src/aiburn.cpp | 2 +- source/blood/src/aicaleb.cpp | 2 +- source/blood/src/aicerber.cpp | 2 +- source/blood/src/aicult.cpp | 2 +- source/blood/src/aigarg.cpp | 2 +- source/blood/src/aighost.cpp | 2 +- source/blood/src/aigilbst.cpp | 2 +- source/blood/src/aihand.cpp | 2 +- source/blood/src/aihound.cpp | 2 +- source/blood/src/aiinnoc.cpp | 2 +- source/blood/src/aipod.cpp | 2 +- source/blood/src/airat.cpp | 2 +- source/blood/src/aispid.cpp | 2 +- source/blood/src/aitchern.cpp | 2 +- source/blood/src/aiunicult.cpp | 1 - source/blood/src/aizomba.cpp | 2 +- source/blood/src/aizombf.cpp | 2 +- source/blood/src/asound.h | 31 ------------------ source/blood/src/blood.cpp | 2 -- source/blood/src/callback.cpp | 1 - source/blood/src/d_menu.cpp | 2 +- source/blood/src/gib.cpp | 2 +- source/blood/src/levels.cpp | 2 -- source/blood/src/loadsave.cpp | 2 -- source/blood/src/nnexts.cpp | 2 +- source/blood/src/osdcmd.cpp | 1 - source/blood/src/player.cpp | 1 - source/blood/src/qav.cpp | 1 - source/blood/src/seq.cpp | 1 - source/blood/src/sfx.cpp | 1 - source/blood/src/sfx.h | 58 ---------------------------------- source/blood/src/sound.cpp | 1 - source/blood/src/sound.h | 15 +++++++++ source/blood/src/triggers.cpp | 1 - source/blood/src/weapon.cpp | 1 - 39 files changed, 36 insertions(+), 128 deletions(-) delete mode 100644 source/blood/src/asound.h delete mode 100644 source/blood/src/sfx.h diff --git a/source/blood/src/actor.cpp b/source/blood/src/actor.cpp index 419ae4b7b..7a3c8b0b8 100644 --- a/source/blood/src/actor.cpp +++ b/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" diff --git a/source/blood/src/ai.cpp b/source/blood/src/ai.cpp index a824a9e3d..35552bc8c 100644 --- a/source/blood/src/ai.cpp +++ b/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" diff --git a/source/blood/src/aibeast.cpp b/source/blood/src/aibeast.cpp index dc16cffe0..5a906b2c3 100644 --- a/source/blood/src/aibeast.cpp +++ b/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 diff --git a/source/blood/src/aiboneel.cpp b/source/blood/src/aiboneel.cpp index 69a44a608..65183b3aa 100644 --- a/source/blood/src/aiboneel.cpp +++ b/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 diff --git a/source/blood/src/aiburn.cpp b/source/blood/src/aiburn.cpp index 657c1da07..e9e9cf38b 100644 --- a/source/blood/src/aiburn.cpp +++ b/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" diff --git a/source/blood/src/aicaleb.cpp b/source/blood/src/aicaleb.cpp index 3ebd00781..63bff731f 100644 --- a/source/blood/src/aicaleb.cpp +++ b/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 diff --git a/source/blood/src/aicerber.cpp b/source/blood/src/aicerber.cpp index 89946ab94..81523f690 100644 --- a/source/blood/src/aicerber.cpp +++ b/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 diff --git a/source/blood/src/aicult.cpp b/source/blood/src/aicult.cpp index d5a6f6bf2..9ac055cb8 100644 --- a/source/blood/src/aicult.cpp +++ b/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 diff --git a/source/blood/src/aigarg.cpp b/source/blood/src/aigarg.cpp index 2cd7d4903..b8e0fb9d7 100644 --- a/source/blood/src/aigarg.cpp +++ b/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" diff --git a/source/blood/src/aighost.cpp b/source/blood/src/aighost.cpp index 1a893e4a7..6ca71e29b 100644 --- a/source/blood/src/aighost.cpp +++ b/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" diff --git a/source/blood/src/aigilbst.cpp b/source/blood/src/aigilbst.cpp index 8a3a71c2b..4281e32e0 100644 --- a/source/blood/src/aigilbst.cpp +++ b/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 diff --git a/source/blood/src/aihand.cpp b/source/blood/src/aihand.cpp index 19ee7ea27..0705e5071 100644 --- a/source/blood/src/aihand.cpp +++ b/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 diff --git a/source/blood/src/aihound.cpp b/source/blood/src/aihound.cpp index c17d2c835..32181dd96 100644 --- a/source/blood/src/aihound.cpp +++ b/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" diff --git a/source/blood/src/aiinnoc.cpp b/source/blood/src/aiinnoc.cpp index cd3379288..3ae982773 100644 --- a/source/blood/src/aiinnoc.cpp +++ b/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 diff --git a/source/blood/src/aipod.cpp b/source/blood/src/aipod.cpp index aabfdba1d..25daf6b03 100644 --- a/source/blood/src/aipod.cpp +++ b/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 diff --git a/source/blood/src/airat.cpp b/source/blood/src/airat.cpp index 21d8c337f..1cde35073 100644 --- a/source/blood/src/airat.cpp +++ b/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 diff --git a/source/blood/src/aispid.cpp b/source/blood/src/aispid.cpp index d8e3456aa..e3dc2486e 100644 --- a/source/blood/src/aispid.cpp +++ b/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 diff --git a/source/blood/src/aitchern.cpp b/source/blood/src/aitchern.cpp index cdc9da23e..3bda3ab1c 100644 --- a/source/blood/src/aitchern.cpp +++ b/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 diff --git a/source/blood/src/aiunicult.cpp b/source/blood/src/aiunicult.cpp index 971575bc4..45a308b83 100644 --- a/source/blood/src/aiunicult.cpp +++ b/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" diff --git a/source/blood/src/aizomba.cpp b/source/blood/src/aizomba.cpp index 27aa72179..24bedf703 100644 --- a/source/blood/src/aizomba.cpp +++ b/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 diff --git a/source/blood/src/aizombf.cpp b/source/blood/src/aizombf.cpp index 08379826d..7825b10eb 100644 --- a/source/blood/src/aizombf.cpp +++ b/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 diff --git a/source/blood/src/asound.h b/source/blood/src/asound.h deleted file mode 100644 index 0357203f9..000000000 --- a/source/blood/src/asound.h +++ /dev/null @@ -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 diff --git a/source/blood/src/blood.cpp b/source/blood/src/blood.cpp index 2bea2f97e..6f9b07e08 100644 --- a/source/blood/src/blood.cpp +++ b/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" diff --git a/source/blood/src/callback.cpp b/source/blood/src/callback.cpp index 5bf8d9580..96f8e692d 100644 --- a/source/blood/src/callback.cpp +++ b/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" diff --git a/source/blood/src/d_menu.cpp b/source/blood/src/d_menu.cpp index d8ac4ce17..d395e8d64 100644 --- a/source/blood/src/d_menu.cpp +++ b/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(); diff --git a/source/blood/src/gib.cpp b/source/blood/src/gib.cpp index 8fb0b6505..6ce6e6c0f 100644 --- a/source/blood/src/gib.cpp +++ b/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" diff --git a/source/blood/src/levels.cpp b/source/blood/src/levels.cpp index 4392aed8b..ea37c84d6 100644 --- a/source/blood/src/levels.cpp +++ b/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" diff --git a/source/blood/src/loadsave.cpp b/source/blood/src/loadsave.cpp index 46b935833..6e979cfad 100644 --- a/source/blood/src/loadsave.cpp +++ b/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" diff --git a/source/blood/src/nnexts.cpp b/source/blood/src/nnexts.cpp index 8d1d4fae7..7c6372f8f 100644 --- a/source/blood/src/nnexts.cpp +++ b/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" diff --git a/source/blood/src/osdcmd.cpp b/source/blood/src/osdcmd.cpp index aa5d66e93..4da317947 100644 --- a/source/blood/src/osdcmd.cpp +++ b/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" diff --git a/source/blood/src/player.cpp b/source/blood/src/player.cpp index 0eba67b76..38d25d4d7 100644 --- a/source/blood/src/player.cpp +++ b/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" diff --git a/source/blood/src/qav.cpp b/source/blood/src/qav.cpp index 6f639a11d..f85ead901 100644 --- a/source/blood/src/qav.cpp +++ b/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 diff --git a/source/blood/src/seq.cpp b/source/blood/src/seq.cpp index 1e319af39..a354b0af7 100644 --- a/source/blood/src/seq.cpp +++ b/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" diff --git a/source/blood/src/sfx.cpp b/source/blood/src/sfx.cpp index eda0be731..f047033dd 100644 --- a/source/blood/src/sfx.cpp +++ b/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" diff --git a/source/blood/src/sfx.h b/source/blood/src/sfx.h deleted file mode 100644 index b17409187..000000000 --- a/source/blood/src/sfx.h +++ /dev/null @@ -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 diff --git a/source/blood/src/sound.cpp b/source/blood/src/sound.cpp index c327475c0..c4d238d79 100644 --- a/source/blood/src/sound.cpp +++ b/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 diff --git a/source/blood/src/sound.h b/source/blood/src/sound.h index 7969768d1..8fa218f9d 100644 --- a/source/blood/src/sound.h +++ b/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 diff --git a/source/blood/src/triggers.cpp b/source/blood/src/triggers.cpp index df548b118..7e00e1832 100644 --- a/source/blood/src/triggers.cpp +++ b/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" diff --git a/source/blood/src/weapon.cpp b/source/blood/src/weapon.cpp index 503c5527f..15e7b2565 100644 --- a/source/blood/src/weapon.cpp +++ b/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"