- merged several of Blood's smaller headers.

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"

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"

source/blood/src/barf.h

@@ -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);

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"

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

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
 

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
 

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"

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"

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"

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"
 

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"

source/blood/src/fire.h

@@ -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

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"

source/blood/src/gamemenu.h

@@ -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

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
 

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

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"

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"

source/blood/src/mirrors.h

@@ -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

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

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"

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"

source/blood/src/osdcmds.h

@@ -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

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"

source/blood/src/resource.h

@@ -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;

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"
 

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
 

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"

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"

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

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"
 

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

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
 

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"

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"