From bbbd7fadbbb502dfe5e790c0540e806254220e7a Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Sat, 25 Jul 2020 20:34:40 +0200 Subject: [PATCH] - merged several of Blood's smaller headers. --- source/blood/src/asound.cpp | 1 - source/blood/src/barf.cpp | 1 - source/blood/src/barf.h | 25 ----------------------- source/blood/src/blood.cpp | 6 ------ source/blood/src/blood.h | 2 +- source/blood/src/choke.cpp | 1 - source/blood/src/choke.h | 1 - source/blood/src/credits.cpp | 1 - source/blood/src/d_menu.cpp | 2 -- source/blood/src/demo.cpp | 2 -- source/blood/src/endgame.cpp | 2 -- source/blood/src/fire.cpp | 1 - source/blood/src/fire.h | 30 ---------------------------- source/blood/src/gamemenu.cpp | 3 --- source/blood/src/gamemenu.h | 37 ----------------------------------- source/blood/src/globals.cpp | 1 - source/blood/src/globals.h | 4 ++-- source/blood/src/loadsave.cpp | 2 -- source/blood/src/messages.cpp | 1 - source/blood/src/mirrors.h | 33 ------------------------------- source/blood/src/misc.h | 20 +++++++++++++++++++ source/blood/src/network.cpp | 1 - source/blood/src/osdcmd.cpp | 2 -- source/blood/src/osdcmds.h | 29 --------------------------- source/blood/src/resource.cpp | 1 - source/blood/src/resource.h | 30 ---------------------------- source/blood/src/screen.cpp | 1 - source/blood/src/seq.h | 1 - source/blood/src/sfx.cpp | 1 - source/blood/src/sound.cpp | 1 - source/blood/src/sound.h | 3 +-- source/blood/src/tile.cpp | 1 - source/blood/src/trig.cpp | 1 - source/blood/src/trig.h | 1 - source/blood/src/view.cpp | 6 +----- source/blood/src/weapon.cpp | 1 - 36 files changed, 25 insertions(+), 231 deletions(-) delete mode 100644 source/blood/src/barf.h delete mode 100644 source/blood/src/fire.h delete mode 100644 source/blood/src/gamemenu.h delete mode 100644 source/blood/src/mirrors.h delete mode 100644 source/blood/src/osdcmds.h delete mode 100644 source/blood/src/resource.h diff --git a/source/blood/src/asound.cpp b/source/blood/src/asound.cpp index 472328c9b..b78333743 100644 --- a/source/blood/src/asound.cpp +++ b/source/blood/src/asound.cpp @@ -30,7 +30,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #include "config.h" #include "db.h" #include "player.h" -#include "resource.h" #include "sound.h" #include "loadsave.h" #include "raze_sound.h" diff --git a/source/blood/src/barf.cpp b/source/blood/src/barf.cpp index 145a6af87..d7a305056 100644 --- a/source/blood/src/barf.cpp +++ b/source/blood/src/barf.cpp @@ -25,7 +25,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #include "compat.h" #include "common_game.h" -#include "resource.h" #include "misc.h" #include "globals.h" #include "sound.h" diff --git a/source/blood/src/barf.h b/source/blood/src/barf.h deleted file mode 100644 index a86744a1c..000000000 --- a/source/blood/src/barf.h +++ /dev/null @@ -1,25 +0,0 @@ -//------------------------------------------------------------------------- -/* -Copyright (C) 2010-2019 EDuke32 developers and contributors -Copyright (C) 2019 sirlemonhead, 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 - -void ParseScript(const char* scriptFileName); diff --git a/source/blood/src/blood.cpp b/source/blood/src/blood.cpp index 6f9b07e08..801bbd333 100644 --- a/source/blood/src/blood.cpp +++ b/source/blood/src/blood.cpp @@ -40,19 +40,13 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #include "dude.h" #include "endgame.h" #include "eventq.h" -#include "fire.h" #include "fx.h" #include "gib.h" #include "getopt.h" #include "globals.h" #include "levels.h" #include "loadsave.h" -#include "gamemenu.h" -#include "mirrors.h" #include "network.h" -#include "osdcmds.h" -#include "replace.h" -#include "resource.h" #include "screen.h" #include "sectorfx.h" #include "seq.h" diff --git a/source/blood/src/blood.h b/source/blood/src/blood.h index a9951efad..97878d64d 100644 --- a/source/blood/src/blood.h +++ b/source/blood/src/blood.h @@ -23,7 +23,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #pragma once #include "levels.h" -#include "resource.h" +#include "misc.h" #include "db.h" BEGIN_BLD_NS diff --git a/source/blood/src/choke.cpp b/source/blood/src/choke.cpp index 7af6bb86f..7c1a1c1bf 100644 --- a/source/blood/src/choke.cpp +++ b/source/blood/src/choke.cpp @@ -32,7 +32,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #include "levels.h" #include "player.h" #include "qav.h" -#include "resource.h" BEGIN_BLD_NS diff --git a/source/blood/src/choke.h b/source/blood/src/choke.h index 5cd5d0b4a..edb5d7f64 100644 --- a/source/blood/src/choke.h +++ b/source/blood/src/choke.h @@ -25,7 +25,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #include "common_game.h" #include "player.h" #include "qav.h" -#include "resource.h" BEGIN_BLD_NS diff --git a/source/blood/src/credits.cpp b/source/blood/src/credits.cpp index 3de4a038c..10dfaa3cd 100644 --- a/source/blood/src/credits.cpp +++ b/source/blood/src/credits.cpp @@ -31,7 +31,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #include "config.h" #include "controls.h" #include "globals.h" -#include "resource.h" #include "screen.h" #include "sound.h" #include "view.h" diff --git a/source/blood/src/d_menu.cpp b/source/blood/src/d_menu.cpp index d395e8d64..f6b95a863 100644 --- a/source/blood/src/d_menu.cpp +++ b/source/blood/src/d_menu.cpp @@ -28,12 +28,10 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #include "common_game.h" #include "blood.h" #include "config.h" -#include "gamemenu.h" #include "globals.h" #include "inifile.h" #include "levels.h" #include "qav.h" -#include "resource.h" #include "view.h" #include "demo.h" #include "network.h" diff --git a/source/blood/src/demo.cpp b/source/blood/src/demo.cpp index d6103c083..473ff6ef7 100644 --- a/source/blood/src/demo.cpp +++ b/source/blood/src/demo.cpp @@ -32,8 +32,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #include "blood.h" #include "controls.h" #include "demo.h" -#include "fire.h" -#include "gamemenu.h" #include "globals.h" #include "levels.h" #include "messages.h" diff --git a/source/blood/src/endgame.cpp b/source/blood/src/endgame.cpp index bfac65063..0d68f68f5 100644 --- a/source/blood/src/endgame.cpp +++ b/source/blood/src/endgame.cpp @@ -32,14 +32,12 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #include "globals.h" #include "levels.h" #include "loadsave.h" -#include "gamemenu.h" #include "network.h" #include "player.h" #include "sound.h" #include "view.h" #include "messages.h" #include "statistics.h" -#include "gamemenu.h" #include "gstrings.h" #include "raze_sound.h" diff --git a/source/blood/src/fire.cpp b/source/blood/src/fire.cpp index 60f0690a1..904da6bbf 100644 --- a/source/blood/src/fire.cpp +++ b/source/blood/src/fire.cpp @@ -29,7 +29,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #include "build.h" #include "common_game.h" #include "blood.h" -#include "fire.h" #include "globals.h" #include "misc.h" #include "tile.h" diff --git a/source/blood/src/fire.h b/source/blood/src/fire.h deleted file mode 100644 index 62771b038..000000000 --- a/source/blood/src/fire.h +++ /dev/null @@ -1,30 +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 FireInit(void); -void FireProcess(void); - -END_BLD_NS diff --git a/source/blood/src/gamemenu.cpp b/source/blood/src/gamemenu.cpp index 31bf46c39..8d9332391 100644 --- a/source/blood/src/gamemenu.cpp +++ b/source/blood/src/gamemenu.cpp @@ -28,14 +28,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #include "common_game.h" #include "blood.h" #include "config.h" -#include "gamemenu.h" #include "globals.h" #include "inifile.h" #include "levels.h" -#include "gamemenu.h" #include "qav.h" #include "demo.h" -#include "resource.h" #include "view.h" #include "c_bind.h" #include "gstrings.h" diff --git a/source/blood/src/gamemenu.h b/source/blood/src/gamemenu.h deleted file mode 100644 index 909d714c2..000000000 --- a/source/blood/src/gamemenu.h +++ /dev/null @@ -1,37 +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 "compat.h" -#include "common_game.h" -#include "blood.h" -#include "inifile.h" -#include "resource.h" -#include "qav.h" - -BEGIN_BLD_NS - -void drawLoadingScreen(void); -void UpdateNetworkMenus(void); - -END_BLD_NS diff --git a/source/blood/src/globals.cpp b/source/blood/src/globals.cpp index 8da19385a..b1bebaa11 100644 --- a/source/blood/src/globals.cpp +++ b/source/blood/src/globals.cpp @@ -29,7 +29,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #include "build.h" #include "common_game.h" #include "globals.h" -#include "resource.h" BEGIN_BLD_NS diff --git a/source/blood/src/globals.h b/source/blood/src/globals.h index 5cc10c33e..446faef73 100644 --- a/source/blood/src/globals.h +++ b/source/blood/src/globals.h @@ -23,8 +23,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #pragma once #include "compat.h" #include "build.h" -#include "resource.h" #include "version.h" +#include "filesystem.h" BEGIN_BLD_NS @@ -35,6 +35,6 @@ extern int gFrame; extern int gFrameRate; extern bool bVanilla; -extern Resource &gSysRes; +extern FileSystem &gSysRes; END_BLD_NS diff --git a/source/blood/src/loadsave.cpp b/source/blood/src/loadsave.cpp index 6e979cfad..f28c2e0e8 100644 --- a/source/blood/src/loadsave.cpp +++ b/source/blood/src/loadsave.cpp @@ -34,10 +34,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #include "globals.h" #include "db.h" #include "messages.h" -#include "gamemenu.h" #include "network.h" #include "loadsave.h" -#include "resource.h" #include "screen.h" #include "sectorfx.h" #include "seq.h" diff --git a/source/blood/src/messages.cpp b/source/blood/src/messages.cpp index b0c8a40a9..ec6c142ef 100644 --- a/source/blood/src/messages.cpp +++ b/source/blood/src/messages.cpp @@ -34,7 +34,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #include "globals.h" #include "levels.h" #include "loadsave.h" -#include "gamemenu.h" #include "messages.h" #include "network.h" #include "player.h" diff --git a/source/blood/src/mirrors.h b/source/blood/src/mirrors.h deleted file mode 100644 index deff6d4f1..000000000 --- a/source/blood/src/mirrors.h +++ /dev/null @@ -1,33 +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 "fix16.h" - -BEGIN_BLD_NS - -void InitMirrors(void); -void sub_5571C(char mode); -void sub_557C4(int x, int y, int interpolation); -void DrawMirrors(int x, int y, int z, fix16_t a, fix16_t horiz, int smooth, int viewPlayer); - -END_BLD_NS diff --git a/source/blood/src/misc.h b/source/blood/src/misc.h index 9d1c4985e..277d58b97 100644 --- a/source/blood/src/misc.h +++ b/source/blood/src/misc.h @@ -22,6 +22,13 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. //------------------------------------------------------------------------- #pragma once +#include "common.h" +#include "filesystem.h" + +using Resource = FileSystem; +// Map NBlood's resource system to our own. +using DICTNODE = FResourceLump; + BEGIN_BLD_NS void *ResReadLine(char *buffer, unsigned int nBytes, void **pRes); @@ -31,5 +38,18 @@ void wsrand(int); void ChangeExtension(char *pzFile, const char *pzExt); void SplitPath(const char *pzPath, char *pzDirectory, char *pzFile, char *pzType); void ConcatPath(const char* pzPath1, const char* pzPath2, char* pzConcatPath); +void FireInit(void); +void FireProcess(void); +void drawLoadingScreen(void); +void UpdateNetworkMenus(void); +void InitMirrors(void); +void sub_5571C(char mode); +void sub_557C4(int x, int y, int interpolation); +void DrawMirrors(int x, int y, int z, fix16_t a, fix16_t horiz, int smooth, int viewPlayer); +int32_t registerosdcommands(void); +int qanimateoffs(int a1, int a2); +void qloadpalette(); +int32_t qgetpalookup(int32_t a1, int32_t a2); +void HookReplaceFunctions(); END_BLD_NS diff --git a/source/blood/src/network.cpp b/source/blood/src/network.cpp index 54cde2663..bec668580 100644 --- a/source/blood/src/network.cpp +++ b/source/blood/src/network.cpp @@ -33,7 +33,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #include "controls.h" #include "globals.h" #include "network.h" -#include "gamemenu.h" #include "player.h" #include "seq.h" #include "sound.h" diff --git a/source/blood/src/osdcmd.cpp b/source/blood/src/osdcmd.cpp index 4da317947..eaedc9a91 100644 --- a/source/blood/src/osdcmd.cpp +++ b/source/blood/src/osdcmd.cpp @@ -31,12 +31,10 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #include "config.h" #include "blood.h" #include "demo.h" -#include "gamemenu.h" #include "globals.h" #include "levels.h" #include "messages.h" #include "network.h" -#include "osdcmds.h" #include "screen.h" #include "sound.h" #include "view.h" diff --git a/source/blood/src/osdcmds.h b/source/blood/src/osdcmds.h deleted file mode 100644 index 41ade289c..000000000 --- a/source/blood/src/osdcmds.h +++ /dev/null @@ -1,29 +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 - -int32_t registerosdcommands(void); - -END_BLD_NS diff --git a/source/blood/src/resource.cpp b/source/blood/src/resource.cpp index 8decdce5d..a897a3554 100644 --- a/source/blood/src/resource.cpp +++ b/source/blood/src/resource.cpp @@ -31,7 +31,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #include "common_game.h" #include "misc.h" -#include "resource.h" #if B_BIG_ENDIAN == 1 #include "qav.h" diff --git a/source/blood/src/resource.h b/source/blood/src/resource.h deleted file mode 100644 index df9b55063..000000000 --- a/source/blood/src/resource.h +++ /dev/null @@ -1,30 +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 "common.h" -#include "filesystem.h" - -using Resource = FileSystem; -// Map NBlood's resource system to our own. -using DICTNODE = FResourceLump; diff --git a/source/blood/src/screen.cpp b/source/blood/src/screen.cpp index 2ef9c6057..cd28738e8 100644 --- a/source/blood/src/screen.cpp +++ b/source/blood/src/screen.cpp @@ -28,7 +28,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #include "globals.h" #include "config.h" -#include "resource.h" #include "screen.h" #include "v_video.h" diff --git a/source/blood/src/seq.h b/source/blood/src/seq.h index 8b7661415..34029271b 100644 --- a/source/blood/src/seq.h +++ b/source/blood/src/seq.h @@ -21,7 +21,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ //------------------------------------------------------------------------- #pragma once -#include "resource.h" BEGIN_BLD_NS diff --git a/source/blood/src/sfx.cpp b/source/blood/src/sfx.cpp index f047033dd..bcaac0664 100644 --- a/source/blood/src/sfx.cpp +++ b/source/blood/src/sfx.cpp @@ -30,7 +30,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #include "config.h" #include "gameutil.h" #include "player.h" -#include "resource.h" #include "sound.h" #include "trig.h" #include "raze_sound.h" diff --git a/source/blood/src/sound.cpp b/source/blood/src/sound.cpp index c4d238d79..33c63e6d3 100644 --- a/source/blood/src/sound.cpp +++ b/source/blood/src/sound.cpp @@ -27,7 +27,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #include "common_game.h" #include "config.h" #include "levels.h" -#include "resource.h" #include "sound.h" #include "baselayer.h" #include "raze_music.h" diff --git a/source/blood/src/sound.h b/source/blood/src/sound.h index 8fa218f9d..b95ac7987 100644 --- a/source/blood/src/sound.h +++ b/source/blood/src/sound.h @@ -22,7 +22,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. //------------------------------------------------------------------------- #pragma once -#include "resource.h" +#include "misc.h" #include "raze_music.h" BEGIN_BLD_NS @@ -31,7 +31,6 @@ struct SAMPLE2D { int at0; char at4; - DICTNODE *at5; }; // 9 bytes struct SFX diff --git a/source/blood/src/tile.cpp b/source/blood/src/tile.cpp index 3878e94d0..ba428eb93 100644 --- a/source/blood/src/tile.cpp +++ b/source/blood/src/tile.cpp @@ -33,7 +33,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #include "blood.h" #include "config.h" #include "globals.h" -#include "resource.h" #include "tile.h" #include "view.h" diff --git a/source/blood/src/trig.cpp b/source/blood/src/trig.cpp index cbe6d7a1b..a4aadf41d 100644 --- a/source/blood/src/trig.cpp +++ b/source/blood/src/trig.cpp @@ -28,7 +28,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #include "build.h" #include "pragmas.h" #include "common_game.h" -#include "resource.h" #include "trig.h" BEGIN_BLD_NS diff --git a/source/blood/src/trig.h b/source/blood/src/trig.h index 33e968e9c..321dc8106 100644 --- a/source/blood/src/trig.h +++ b/source/blood/src/trig.h @@ -22,7 +22,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. //------------------------------------------------------------------------- #pragma once -#include "resource.h" BEGIN_BLD_NS diff --git a/source/blood/src/view.cpp b/source/blood/src/view.cpp index fe5a2d6b5..744c3bd1f 100644 --- a/source/blood/src/view.cpp +++ b/source/blood/src/view.cpp @@ -37,19 +37,15 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #include "config.h" #include "db.h" #include "endgame.h" -#include "gamemenu.h" #include "gameutil.h" #include "globals.h" #include "levels.h" #include "loadsave.h" #include "map2d.h" #include "messages.h" -#include "gamemenu.h" -#include "mirrors.h" #include "network.h" #include "player.h" -#include "replace.h" -#include "screen.h" + #include "screen.h" #include "sectorfx.h" #include "tile.h" #include "trig.h" diff --git a/source/blood/src/weapon.cpp b/source/blood/src/weapon.cpp index 15e7b2565..e6ef41b01 100644 --- a/source/blood/src/weapon.cpp +++ b/source/blood/src/weapon.cpp @@ -42,7 +42,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #include "loadsave.h" #include "player.h" #include "qav.h" -#include "resource.h" #include "seq.h" #include "sound.h" #include "trig.h"