Header clean up

DescentDevelopers · Jun 2, 2024 · 552fc59 · 552fc59
1 parent 3738b5a
commit 552fc59
Show file tree

Hide file tree

Showing 97 changed files with 239 additions and 281 deletions.
diff --git a/2dlib/ddgr.h b/2dlib/ddgr.h
@@ -78,8 +78,6 @@
 #ifndef _DDGR_H
 #define _DDGR_H
 
-#include "pstypes.h"
-#include "Macros.h"
 #include "grdefs.h"
 
 //	----------------------------------------------------------------------------

diff --git a/2dlib/lib2d.h b/2dlib/lib2d.h
@@ -24,7 +24,7 @@
 #define LIB2D_H
 
 #include "gr.h"
-#include "renderer.h"
+#include "ddgr.h"
 
 //	structures
 

diff --git a/2dlib/memsurf.cpp b/2dlib/memsurf.cpp
@@ -68,12 +68,13 @@
  * $NoKeywords: $
  */
 
-#include "lib2d.h"
+#include "gr.h"
 
-#include "bitmap.h"
+#include <cstring>
+#include <cstdlib>
 
-#include <string.h>
-#include <stdlib.h>
+#include "lib2d.h"
+#include "bitmap.h"
 #include "mem.h"
 
 //	----------------------------------------------------------------------------

diff --git a/2dlib/pen.cpp b/2dlib/pen.cpp
@@ -93,6 +93,7 @@
 
 #include "lib2d.h"
 #include "pserror.h"
+#include "renderer.h"
 
 #define CLIP_LEFT (vp_InitLeft + vp_Left)
 #define CLIP_TOP (vp_InitTop + vp_Top)

diff --git a/Descent3/Controls.cpp b/Descent3/Controls.cpp
@@ -406,21 +406,16 @@
 
 #include "controls.h"
 
-#include "object.h"
 #include "pserror.h"
 #include "game.h"
 #include "ddio.h"
 #include "joystick.h"
-#include "descent.h"
 #include "mono.h"
 #include "weapon.h"
-#include "controller.h"
-#include "Macros.h"
 #include "gamesequence.h"
 #include "pilot.h"
 #include "hud.h"
 #include "stringtable.h"
-#include "TelCom.h"
 #include "multi.h"
 #include "args.h"
 

diff --git a/Descent3/CtlCfgElem.cpp b/Descent3/CtlCfgElem.cpp
@@ -125,7 +125,6 @@
 #include "localization.h"
 
 #include <string.h>
-#include "joystick.h"
 
 // all controller binding texts
 static char Ctltext_KeyBindings[][16] = {"",

diff --git a/Descent3/TelComGoals.cpp b/Descent3/TelComGoals.cpp
@@ -95,14 +95,12 @@
 #include "game.h"
 #include "mem.h"
 #include "stringtable.h"
-#include "gametexture.h"
 #include "textaux.h"
 #include "TelComEfxStructs.h"
 #include "TelComEffects.h"
 #include "levelgoal.h"
 #include "textaux.h"
 #include "Mission.h"
-#include "Macros.h"
 #include "hlsoundlib.h"
 
 #include <algorithm>

diff --git a/Descent3/config.cpp b/Descent3/config.cpp
@@ -279,43 +279,30 @@
  * $NoKeywords: $
  */
 
-#include "ConfigItem.h"
-#include "player.h"
 #include "config.h"
-#include "ddio.h"
 #include "newui.h"
 #include "3d.h"
-#include "polymodel.h"
 #include "application.h"
 #include "descent.h"
 #include "mono.h"
-#include "Mission.h"
-#include "ddio.h"
-#include "gamefont.h"
-#include "multi_ui.h"
-#include "cinematics.h"
 #include "hlsoundlib.h"
 #include "terrain.h"
-#include "cfile.h"
-#include "mem.h"
-#include "lighting.h"
 #include "physics.h"
 #include "pilot.h"
 #include "hud.h"
-#include "voice.h"
 #include "bitmap.h"
 #include "game.h"
-#include "render.h"
 #include "stringtable.h"
 #include "SmallViews.h"
-#include "D3ForceFeedback.h"
 #include "descent.h"
 #include "appdatabase.h"
 #include "hlsoundlib.h"
 #include "soundload.h"
 #include "sounds.h"
 #include "ctlconfig.h"
 #include "musicapi.h"
+#include "Macros.h"
+#include "forcefeedback.h"
 
 #include <string.h>
 #include <stdlib.h>

diff --git a/Descent3/config.h b/Descent3/config.h
@@ -117,6 +117,8 @@
 #ifndef __CONFIG_H__
 #define __CONFIG_H__
 
+#include <cstdint>
+
 // Main menu configuration functions
 // ------------------------------------------------------
 // ConfigForceFeedback

diff --git a/Descent3/ctlconfig.cpp b/Descent3/ctlconfig.cpp
@@ -277,20 +277,23 @@
  *
  * $NoKeywords: $
  */
+
 #include "ctlconfig.h"
+
+#include <cstring>
+
 #include "CtlCfgElem.h"
 #include "ctlconfigtxt.h"
 #include "game.h"
 #include "weapon.h"
 #include "pilot.h"
-#include "bitmap.h"
-#include "multi.h"
 #include "gameloop.h"
 #include "gamefont.h"
 #include "D3ForceFeedback.h"
 #include "hlsoundlib.h"
-#include "ddio.h"
-#include <string.h>
+#include "Macros.h"
+#include "ddio_common.h"
+
 //////////////////////////////////////////////////////////////////////////////
 #define IDV_KCONFIG 10
 #define IDV_CCONFIG 11

diff --git a/Descent3/dedicated_server.cpp b/Descent3/dedicated_server.cpp
@@ -112,24 +112,18 @@
 typedef int socklen_t;
 #endif
 
-#include "pstypes.h"
 #include "pserror.h"
 #include "pstring.h"
-#include "cfile.h"
 #include "inffile.h"
 #include "dedicated_server.h"
 #include "multi.h"
 #include "args.h"
 #include "appconsole.h"
 #include "ddio.h"
-#include "newui.h"
-#include "ui.h"
 #include "multi_dll_mgr.h"
 #include "multi_ui.h"
 #include "Mission.h"
 #include "multi_server.h"
-#include "Macros.h"
-#include "game.h"
 #include "mem.h"
 #include "stringtable.h"
 #include "multi_save_settings.h"

diff --git a/Descent3/descent.h b/Descent3/descent.h
@@ -131,6 +131,10 @@
 #include <stdlib.h>
 #include "application.h"
 
+#ifdef __LINUX__
+#include "linux_fix.h"
+#endif
+
 // The name of this product
 #ifdef DEMO
 #define PRODUCT_NAME "Descent 3 Demo"

diff --git a/Descent3/init.cpp b/Descent3/init.cpp
@@ -987,6 +987,8 @@
 #include "debuggraph.h"
 #include "vibeinterface.h"
 
+#include "ddvid.h"
+
 // Uncomment this to allow all languages
 #define ALLOW_ALL_LANG 1
 

diff --git a/Descent3/lighting.cpp b/Descent3/lighting.cpp
@@ -24,12 +24,9 @@
  * $NoKeywords: $
  */
 
-#include "3d.h"
-#include "texture.h"
 #include "gametexture.h"
 #include "lighting.h"
 #include "lightmap.h"
-#include "descent.h"
 #include "game.h"
 #include "room.h"
 #include <string.h>
@@ -42,7 +39,6 @@
 #include "config.h"
 #include "dedicated_server.h"
 #include "objinfo.h"
-#include "Macros.h"
 
 #include <algorithm>
 

diff --git a/Descent3/lnxmain.cpp b/Descent3/lnxmain.cpp
@@ -30,10 +30,10 @@
 
 #include <SDL.h>
 
-#include "program.h"
+#include "lnxapp.h"
+#include "lnxdatabase.h"
+
 #include "descent.h"
-#include "application.h"
-#include "appdatabase.h"
 #include "args.h"
 #include "init.h"
 
@@ -42,6 +42,7 @@
 #include "loki_utils.h"
 
 #include "log.h"
+#include "d3_version.h"
 
 extern bool ddio_mouseGrabbed;
 int no_debug_dialog = 0;

diff --git a/Descent3/multi_dll_mgr.h b/Descent3/multi_dll_mgr.h
@@ -85,6 +85,9 @@
 #ifndef _multi_dll_header
 #define _multi_dll_header
 
+#include "ui.h"
+#include "newui.h"
+
 #define MT_EVT_LOGIN 1
 #define MT_EVT_FIRST_FRAME 2
 #define MT_EVT_FRAME 3

diff --git a/Descent3/program.cpp b/Descent3/program.cpp
@@ -64,6 +64,11 @@
 #include "descent.h"
 
 #include "appdatabase.h"
+#if defined(WIN32)
+#include "windatabase.h"
+#elif defined(__LINUX__)
+#include "lnxdatabase.h"
+#endif
 
 program_version Program_version;
 

diff --git a/Descent3/room.h b/Descent3/room.h
@@ -363,9 +363,9 @@
 #ifndef _ROOM_H
 #define _ROOM_H
 
-#include "pstypes.h"
 #include "vecmat_external.h"
 #include "gametexture.h"
+#include "bitmap.h"
 
 #ifdef NEWEDITOR
 #include "..\neweditor\ned_GameTexture.h"

diff --git a/Descent3/splinter.cpp b/Descent3/splinter.cpp
@@ -16,20 +16,17 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include <algorithm>
+#include <cstdlib>
 
 #include "fireball.h"
 #include "object.h"
 #include "splinter.h"
 #include "polymodel.h"
 #include "renderer.h"
 #include "gametexture.h"
-
-#include "Macros.h"
-#include <stdlib.h>
-
 #include "psrand.h"
 
-#include <algorithm>
 
 // Given an object, renders the representation of this splinter
 void DrawSplinterObject(object *obj) {

diff --git a/Descent3/terrain.cpp b/Descent3/terrain.cpp
@@ -16,25 +16,21 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include <cstdlib>
+
 #ifdef NEWEDITOR
 #include "neweditor\globals.h"
-#else
-#include <stdlib.h>
 #endif
 #include "vecmat.h"
-#include "object.h"
 #include "mono.h"
 #include "terrain.h"
 #include "pserror.h"
-#include "texture.h"
-#include "bitmap.h"
 #include "gametexture.h"
 #include "lighting.h"
 #include "lightmap.h"
 #include "weather.h"
 #include <string.h>
 #include "mem.h"
-#include "Macros.h"
 #include "dedicated_server.h"
 #include "psrand.h"
 #ifdef EDITOR

diff --git a/Descent3/weapon.cpp b/Descent3/weapon.cpp
@@ -332,34 +332,31 @@
 * $NoKeywords: $
 */
 
+#include <algorithm>
+#include <cstdlib>
+#include <cstdio>
+#include <cstdarg>
+#include <cstring>
+
 #include "weapon.h"
-#include "pstypes.h"
 #include "pserror.h"
 #include "object.h"
 #include "3d.h"
-#include <stdlib.h>
-#include <stdio.h>
-#include <stdarg.h>
-#include <string.h>
 #include "bitmap.h"
 #include "vclip.h"
 #include "game.h"
 #include "polymodel.h"
 #include "player.h"
 #include "hud.h"
 #include "hlsoundlib.h"
-#include "soundload.h"
 #include "objinfo.h"
 #include "gametexture.h"
 #include "ship.h"
-#include "gauges.h"
 #include "sounds.h"
 #include "stringtable.h"
-#include "Macros.h"
 #include "cfile.h"
 #include "AIMain.h"
 
-#include <algorithm>
 
 // #include "samirlog.h"
 #define LOGFILE(_s)

diff --git a/Descent3/winmain.cpp b/Descent3/winmain.cpp
@@ -23,8 +23,8 @@
 #include "mono.h"
 #include "descent.h"
 #include "texture.h"
-#include "application.h"
-#include "appdatabase.h"
+#include "winapp.h"
+#include "windatabase.h"
 #include "pserror.h"
 #include "args.h"
 #include "init.h"