More unused stuff removal (#49)

* More unused stuff removal

delete:
- giant 'metaheaders' (JA2 All.h, Laptop All.h, etc), preferring to add #includes directly where needed
- unused ExceptionHandling and DbMan translation units
- unused WizShare.h, Bitmap.h, trle.h, video_private.h headers

* remove mentions from vc proj files too

* remove preprocessor conditionals for unused definitions

find . -iname '*.h' -o -iname '*.cpp' -exec unifdef.exe -m -UPRECOMPILED_HEADERS -UJA2_PRECOMPILED_HEADERS -UWIZ8_PRECOMPILED_HEADERS -UPRECOMPILEDHEADERS {} ';'

then manually fixed a couple files the tool errored out on

* yes, the comments too

as title
This commit is contained in:
majcosta
2023-01-03 15:51:48 +02:00
committed by GitHub
parent 6024ed62b0
commit 24425a82b1
563 changed files with 45 additions and 6564 deletions
-4
View File
@@ -1,8 +1,5 @@
#include "builddefines.h"
#ifdef PRECOMPILEDHEADERS
#include "TileEngine All.h"
#else
#include "Ambient Control.h"
#include "Sound Control.h"
#include "Game Events.h"
@@ -14,7 +11,6 @@
#include "Strategic Movement.h"
#include "Game Clock.h"
#include "strategic mines.h"
#endif
AMBIENTDATA_STRUCT gAmbData[ MAX_AMBIENT_SOUNDS ];
INT16 gsNumAmbData = 0;
-4
View File
@@ -1,13 +1,9 @@
#ifdef PRECOMPILEDHEADERS
#include "TileEngine All.h"
#else
#include "Types.h"
#include "Buildings.h"
#include "Pathai.h"
#include "Structure Wrap.h"
#include "Render Fun.h"
#include "worldman.h"
#endif
#include "AIInternals.h"
-4
View File
@@ -1,6 +1,3 @@
#ifdef PRECOMPILEDHEADERS
#include "TileEngine All.h"
#else
#include "debug.h"
#include "worlddef.h"
#include "worldman.h"
@@ -14,7 +11,6 @@
#include "Sys Globals.h"
#include "SaveLoadMap.h"
#include "Text.h"
#endif
#if 0//dnl ch86 180214
BOOLEAN gfLoadingExitGrids = FALSE;
-6
View File
@@ -1,10 +1,5 @@
#include "builddefines.h"
#ifdef PRECOMPILEDHEADERS
#include "TileEngine All.h"
#include "end game.h"
#include "Morale.h"
#else
#include "debug.h"
#include "weapons.h"
#include "worldman.h"
@@ -39,7 +34,6 @@
#include "Points.h" // added by Flugente
#include "Interface Control.h" // added by Flugente for DrawExplosionWarning(...)
#include "SkillMenu.h"
#endif
#include "Soldier Macros.h"
#include "connect.h"
-4
View File
@@ -1,12 +1,8 @@
#ifdef PRECOMPILEDHEADERS
#include "TileEngine All.h"
#else
#include "types.h"
#include "Fog Of War.h"
#include "Isometric Utils.h"
#include "Simple Render Utils.h"
#include "lighting.h"
#endif
//When line of sight reaches a gridno, and there is a light there, it turns it on.
//This is only done in the cave levels.
-4
View File
@@ -1,8 +1,5 @@
#include "builddefines.h"
#ifdef PRECOMPILEDHEADERS
#include "TileEngine All.h"
#else
#include "sysutil.h"
#include "renderworld.h"
#include "Sound Control.h"
@@ -19,7 +16,6 @@
#include "NPC.h"
#include "Explosion Control.h"
#include "Text.h"
#endif
#ifdef JA2TESTVERSION
#include "message.h"
-4
View File
@@ -1,6 +1,3 @@
#ifdef PRECOMPILEDHEADERS
#include "TileEngine All.h"
#else
#include "debug.h"
#include "renderworld.h"
#include "interface.h"
@@ -10,7 +7,6 @@
#include "overhead.h"
#include "Random.h"
#include "Pathai.h"
#endif
#include "Map Information.h"
#include "meanwhile.h"
#include "strategicmap.h"
-4
View File
@@ -1,8 +1,5 @@
#include "builddefines.h"
#ifdef PRECOMPILEDHEADERS
#include "TileEngine All.h"
#else
#include "debug.h"
#include "animation control.h"
#include "lighteffects.h"
@@ -11,7 +8,6 @@
#include "Game Clock.h"
#include "opplist.h"
#include "Tactical Save.h"
#endif
#include "SaveLoadGame.h"
#include "GameVersion.h" // added by Flugente
-4
View File
@@ -1,7 +1,4 @@
//#include <cmath> // added by Flugente
#ifdef PRECOMPILEDHEADERS
#include "TileEngine All.h"
#else
#include "Map Edgepoints.h"
#include "pathai.h"
@@ -15,7 +12,6 @@
#include "worldman.h"
#include "PreBattle Interface.h" // added by Flugente
#include "Rebel Command.h"
#endif
#include "connect.h"
-4
View File
@@ -1,8 +1,5 @@
#include "builddefines.h"
#ifdef PRECOMPILEDHEADERS
#include "TileEngine All.h"
#else
#include "sgp.h"
#include "Radar Screen.h"
#include "sysutil.h"
@@ -19,7 +16,6 @@
#include "Game Clock.h"
#include "Map Screen Interface Map Inventory.h"
#include "Animation Data.h"
#endif
//forward declarations of common classes to eliminate includes
class OBJECTTYPE;
-6
View File
@@ -1,15 +1,9 @@
#include "builddefines.h"
#ifdef PRECOMPILEDHEADERS
#include "TileEngine All.h"
#include "winfont.h"
#else
#include "worlddef.h"
#include "Render Dirty.h"
#include "sysutil.h"
#include "vobject_blitters.h"
#endif
#ifdef JA2BETAVERSION
#include "Message.h"
-4
View File
@@ -1,6 +1,3 @@
#ifdef PRECOMPILEDHEADERS
#include "TileEngine All.h"
#else
#include "Render Fun.h"
#include "sysutil.h"
#include "debug.h"
@@ -11,7 +8,6 @@
#include "Fog Of War.h"
#include "dialogue control.h"
#include "Random.h"
#endif
// Room Information
//UINT8 gubWorldRoomInfo[ WORLD_MAX ];
-4
View File
@@ -1,6 +1,3 @@
#ifdef PRECOMPILEDHEADERS
#include "TileEngine All.h"
#else
#include "Types.h"
#include "SaveLoadMap.h"
#include "OverHead.h"
@@ -18,7 +15,6 @@
#include "Message.h"
#include "GameSettings.h"
#include "Smell.h"
#endif
#include <vfs/Core/vfs.h>
//SB: make size of gpRevealedMap dependable from variable tactical map dimensions
-4
View File
@@ -1,8 +1,5 @@
#include "builddefines.h"
#ifdef PRECOMPILEDHEADERS
#include "TileEngine All.h"
#else
#include <stdio.h>
#include "types.h"
#include "lighting.h"
@@ -10,7 +7,6 @@
#include "video.h"
#include "WorldDat.h"
#include "Fileman.h"
#endif
#include <vfs/Core/vfs.h>
-4
View File
@@ -1,10 +1,6 @@
#ifdef PRECOMPILEDHEADERS
#include "TileEngine All.h"
#else
#include "types.h"
#include "Isometric Utils.h"
#include "renderworld.h"
#endif
void MarkMapIndexDirty( INT32 iMapIndex )
{
-4
View File
@@ -1,6 +1,3 @@
#ifdef PRECOMPILEDHEADERS
#include "TileEngine All.h"
#else
#include "worlddef.h"
#include "Random.h"
#include "Smell.h"
@@ -14,7 +11,6 @@
#include "Game Clock.h"
#include "Overhead.h"
#include "debug control.h"
#endif
/*
* Smell & Blood system
-4
View File
@@ -1,8 +1,5 @@
#include "builddefines.h"
#ifdef PRECOMPILEDHEADERS
#include "TileEngine All.h"
#else
#include <stdio.h>
#include <string.h>
#include "stdlib.h"
@@ -28,7 +25,6 @@
// sevenfm
#include "environment.h"
#include "Render Fun.h"
#endif
#include "SaveLoadGame.h"
#include "debug control.h"
-6
View File
@@ -2,11 +2,6 @@
// WANNE 2 <changed some lines>
#ifdef PRECOMPILEDHEADERS
#include "TileEngine All.h"
#include "PreBattle Interface.h"
#include "vehicles.h"
#else
//sgp
#include "english.h"
#include "debug.h"
@@ -36,7 +31,6 @@
#include "WordWrap.h"
#include "Game Clock.h"
#include "Isometric Utils.h"
#endif
#include "connect.h"
#include "renderworld.h"//dnl ch45 051009
#include "merc entering.h"
-4
View File
@@ -1,6 +1,3 @@
#ifdef PRECOMPILEDHEADERS
#include "TileEngine All.h"
#else
#include "worlddef.h"
#include "tile animation.h"
#include "debug.h"
@@ -16,7 +13,6 @@
#include "bullets.h"
#include "LightEffects.h"
#include "SmokeEffects.h"
#endif
ANITILE *pAniTileHead = NULL;
-4
View File
@@ -1,13 +1,9 @@
#include "builddefines.h"
#ifdef PRECOMPILEDHEADERS
#include "TileEngine All.h"
#else
#include "debug.h"
#include "Debug Control.h"
#include "tile surface.h"
#include "tile cache.h"
#endif
#ifdef JA2TESTVERSION
#include "sys globals.h"
#endif
-4
View File
@@ -1,11 +1,7 @@
#include "builddefines.h"
#ifdef PRECOMPILEDHEADERS
#include "TileEngine All.h"
#else
#include "debug.h"
#include "sys globals.h"
#endif
#include "XML.h"
-4
View File
@@ -1,9 +1,5 @@
#ifdef PRECOMPILEDHEADERS
#include "TileEngine All.h"
#else
#include "tiledef.h"
#include "worlddef.h"
#endif
#include "GameSettings.h"
-158
View File
@@ -1,158 +0,0 @@
#ifndef __TILEENGINE_ALL_H
#define __TILEENGINE_ALL_H
#pragma message("GENERATED PCH FOR TILEENGINE PROJECT.")
#include <stdio.h>
#include "sgp.h"
#include "Ambient types.h"
#include "fileman.h"
#include "environment.h"
#include "Sound Control.h"
#include "Game Events.h"
#include "Types.h"
#include "Buildings.h"
#include "Isometric Utils.h"
#include "Pathai.h"
#include "Structure Wrap.h"
#include "Random.h"
#include "Overhead.h"
#include "Render Fun.h"
#include "Strategicmap.h"
#include "Sys Globals.h"
#include "lighting.h"
#include "renderworld.h"
#include "Game Clock.h"
#include "quests.h"
#include "Ambient Control.h"
#include "AimMembers.h"
#include "Strategic Event Handler.h"
#include "BobbyR.h"
#include "mercs.h"
#include "email.h"
#include "Merc Hiring.h"
#include "insurance Contract.h"
#include "Strategic Merc Handler.h"
#include "message.h"
#include "opplist.h"
#include "debug.h"
#include "worlddef.h"
#include "worldman.h"
#include "smooth.h"
#include "Exit Grids.h"
#include "Editor Undo.h"
#include "Strategic Movement.h"
#include "Font Control.h"
#include "SaveLoadMap.h"
#include <string.h>
#include "wcheck.h"
#include "soldier control.h"
#include "weapons.h"
#include "handle items.h"
#include "rotting corpses.h"
#include "tile cache.h"
#include "animation control.h"
#include "utilities.h"
#include "soldier create.h"
#include "soldier add.h"
#include "explosion control.h"
#include "tile animation.h"
#include "world items.h"
#include "tiledef.h"
#include "tiledat.h"
#include "interactive tiles.h"
#include "Handle Doors.h"
#include "smokeeffects.h"
#include "handle ui.h"
#include "pits.h"
#include "campaign Types.h"
#include "strategic.h"
#include "Action Items.h"
#include "Soldier Profile.h"
#include "Interface Dialogue.h"
#include "LightEffects.h"
#include "AI.h"
#include "Soldier tile.h"
#include "smell.h"
#include "GameSettings.h"
#include "Fog Of War.h"
#include "Simple Render Utils.h"
#include <stdarg.h>
#include <time.h>
#include "himage.h"
#include "vsurface.h"
#include "vsurface_private.h"
#include "sysutil.h"
#include "interface.h"
#include "interface cursors.h"
#include "structure.h"
#include "points.h"
#include "Dialogue Control.h"
#include "english.h"
#include "mousesystem.h"
#include "jascreens.h"
#include "math.h"
#include <stdlib.h>
#include <errno.h>
#include "input.h"
#include "video.h"
#include "vobject_blitters.h"
#include "edit_sys.h"
#include "line.h"
#include "Animation Data.h"
#include "Timer Control.h"
#include "Radar Screen.h"
#include "Render Dirty.h"
#include "Structure Internals.h"
#include "Shade Table Util.h"
#include <memory.h>
#include "Map Edgepoints.h"
#include "Map Information.h"
#include "vobject.h"
#include "worlddat.h"
#include "overhead map.h"
#include "interface control.h"
#include "cursors.h"
#include "soldier find.h"
#include "interface panels.h"
#include "Tactical Placement GUI.h"
#include "phys math.h"
#include "physics.h"
#include "los.h"
#include "event pump.h"
#include "interface items.h"
#include "Debug Control.h"
#include "text.h"
#include "Squads.h"
#include "Map Screen Interface Map Inventory.h"
//#include "container.h"
#include "fov.h"
#include "Overhead types.h"
#include "Tactical Save.h"
#include "MemMan.h"
#include "font.h"
#include "Button System.h"
#include "gameloop.h"
#include "Cursor Control.h"
#include "MessageBoxScreen.h"
#include "assignments.h"
#include "WordWrap.h"
#include "time.h"
#include "Keys.h"
#include "bullets.h"
#include "Animation Cache.h"
#include "tile surface.h"
#include <wchar.h>
#include "screenids.h"
#include "shading.h"
#include "Soldier Init List.h"
#include "Summary Info.h"
#include "Animated ProgressBar.h"
#include "EditorBuildings.h"
#include "music control.h"
#include "Scheduling.h"
#include "EditorMapInfo.h"
#include "Smoothing Utils.h"
#include "Meanwhile.h"
#endif
-4
View File
@@ -478,10 +478,6 @@
RelativePath=".\tiledef.h"
>
</File>
<File
RelativePath=".\TileEngine All.h"
>
</File>
<File
RelativePath=".\World Tileset Enums.h"
>
-4
View File
@@ -478,10 +478,6 @@
RelativePath="tiledef.h"
>
</File>
<File
RelativePath="TileEngine All.h"
>
</File>
<File
RelativePath="World Tileset Enums.h"
>
-1
View File
@@ -58,7 +58,6 @@
<ClInclude Include="Tile Surface.h" />
<ClInclude Include="TileDat.h" />
<ClInclude Include="tiledef.h" />
<ClInclude Include="TileEngine All.h" />
<ClInclude Include="World Tileset Enums.h" />
<ClInclude Include="WorldDat.h" />
<ClInclude Include="worlddef.h" />
@@ -114,7 +114,6 @@
<ClInclude Include="tiledef.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="TileEngine All.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="World Tileset Enums.h">
-1
View File
@@ -58,7 +58,6 @@
<ClInclude Include="Tile Surface.h" />
<ClInclude Include="TileDat.h" />
<ClInclude Include="tiledef.h" />
<ClInclude Include="TileEngine All.h" />
<ClInclude Include="World Tileset Enums.h" />
<ClInclude Include="WorldDat.h" />
<ClInclude Include="worlddef.h" />
@@ -114,7 +114,6 @@
<ClInclude Include="tiledef.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="TileEngine All.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="World Tileset Enums.h">
-1
View File
@@ -58,7 +58,6 @@
<ClInclude Include="Tile Surface.h" />
<ClInclude Include="TileDat.h" />
<ClInclude Include="tiledef.h" />
<ClInclude Include="TileEngine All.h" />
<ClInclude Include="World Tileset Enums.h" />
<ClInclude Include="WorldDat.h" />
<ClInclude Include="worlddef.h" />
-1
View File
@@ -58,7 +58,6 @@
<ClInclude Include="Tile Surface.h" />
<ClInclude Include="TileDat.h" />
<ClInclude Include="tiledef.h" />
<ClInclude Include="TileEngine All.h" />
<ClInclude Include="World Tileset Enums.h" />
<ClInclude Include="WorldDat.h" />
<ClInclude Include="worlddef.h" />
-4
View File
@@ -1,13 +1,9 @@
#include "builddefines.h"
#ifdef PRECOMPILEDHEADERS
#include "TileEngine All.h"
#else
#include "worlddat.h"
#include "sys globals.h"
#include "tile surface.h"
#include "Debug.h"
#endif
#include <vfs/Core/vfs.h>
#include <vfs/Core/vfs_file_raii.h>
-4
View File
@@ -1,16 +1,12 @@
// Lesh:
#include "builddefines.h"
#ifdef PRECOMPILEDHEADERS
#include "TileEngine All.h"
#else
#include <stdio.h>
#include <string.h>
#include "explosion control.h"
#include "Debug.h"
#include "FileMan.h"
#include "Debug Control.h"
#endif
#include "expat.h"
#include "XML.h"
-4
View File
@@ -1,6 +1,3 @@
#ifdef PRECOMPILEDHEADERS
#include "TileEngine All.h"
#else
#include "sgp.h"
#include "environment.h"
#include "renderworld.h"
@@ -17,7 +14,6 @@
#include "Isometric Utils.h" // added by Flugente
#include "worldman.h" // added by Flugente
#include "Dialogue Control.h" // added by Flugente
#endif
#include "Text.h"
#include "connect.h"
-4
View File
@@ -16,9 +16,6 @@
* Written by Derek Beland, April 14, 1997
*
***************************************************************************************/
#ifdef PRECOMPILEDHEADERS
#include "TileEngine All.h"
#else
#include "worlddef.h"
#include "renderworld.h"
#include "sysutil.h"
@@ -31,7 +28,6 @@
#include "Shade Table Util.h"
#include "rotting corpses.h"
#include "PATHAI.H"
#endif
#define LVL1_L1_PER (50)
#define LVL1_L2_PER (50)
-4
View File
@@ -1,8 +1,5 @@
#include "builddefines.h"
#ifdef PRECOMPILEDHEADERS
#include "TileEngine All.h"
#else
#include "sysutil.h"
#include "utilities.h"
#include "renderworld.h"
@@ -24,7 +21,6 @@
#include "gameloop.h"
#include "Action Items.h" // added by Flugente
#include "Rebel Command.h"
#endif
#include "connect.h"
-4
View File
@@ -1,9 +1,5 @@
#ifdef PRECOMPILEDHEADERS
#include "TileEngine All.h"
#else
#include "phys math.h"
#include <memory.h>
#endif
vector_3 VSetEqual( vector_3 *a )
{
-4
View File
@@ -1,8 +1,5 @@
#include "builddefines.h"
#ifdef PRECOMPILEDHEADERS
#include "TileEngine All.h"
#else
#include "physics.h"
#include "wcheck.h"
#include "isometric utils.h"
@@ -22,7 +19,6 @@
#include "Buildings.h"
#include "Dialogue Control.h" // added by Flugente
#include "Map Information.h" // added by Shadooow
#endif
#include "connect.h"
#include "PATHAI.H"
-4
View File
@@ -1,6 +1,3 @@
#ifdef PRECOMPILEDHEADERS
#include "TileEngine All.h"
#else
#include "types.h"
#include "pits.h"
#include "worlddef.h"
@@ -14,7 +11,6 @@
#include "animation control.h"
#include "strategic.h"
#include "Action Items.h"
#endif
//used by editor
BOOLEAN gfShowPits = FALSE;
-4
View File
@@ -4,9 +4,6 @@
#include "Render Z.h"
///////////////////////////
#ifdef PRECOMPILEDHEADERS
#include "TileEngine All.h"
#else
#include "renderworld.h"
#include "sysutil.h"
#include "vobject_blitters.h"
@@ -24,7 +21,6 @@
#include "Sound Control.h"
#include "LogicalBodyTypes/Layers.h"
#include "LogicalBodyTypes/BodyTypeDB.h"
#endif
#include "Utilities.h"
-4
View File
@@ -1,6 +1,3 @@
#ifdef PRECOMPILEDHEADERS
#include "TileEngine All.h"
#else
#include <string.h>
#include "types.h"
#include "wcheck.h"
@@ -50,7 +47,6 @@
#include "Soldier Ani.h"
#include "ASD.h" // added by Flugente
#include "renderworld.h" // added by Flugente for SetRenderFlags( RENDER_FLAG_FULL );
#endif
#ifdef COUNT_PATHS
extern UINT32 guiSuccessfulPathChecks;
-4
View File
@@ -1,10 +1,6 @@
#ifdef PRECOMPILEDHEADERS
#include "TileEngine All.h"
#else
#include "sgp.h"
#include "wcheck.h"
#include "sysutil.h"
#endif
UINT32 guiBOTTOMPANEL = 0;
UINT32 guiRIGHTPANEL = 0;
-4
View File
@@ -1,6 +1,3 @@
#ifdef PRECOMPILEDHEADERS
#include "TileEngine All.h"
#else
#include "tiledef.h"
#include "worlddef.h"
#include "wcheck.h"
@@ -10,7 +7,6 @@
#include "pathai.h"
#include "tile surface.h"
#include "Tactical Save.h"
#endif
//#include "editscreen.h"
-5
View File
@@ -1,9 +1,5 @@
#include "builddefines.h"
#ifdef PRECOMPILEDHEADERS
#include "TileEngine All.h"
#include "PreBattle Interface.h"
#else
#include "worlddef.h"
#include "worlddat.h"
#include "wcheck.h"
@@ -47,7 +43,6 @@
#include "gamesettings.h"
#include "editscreen.h"
#include "Editor Taskbar Utils.h"
#endif
#ifdef JA2EDITOR
#include "Summary Info.h"
-4
View File
@@ -1,6 +1,3 @@
#ifdef PRECOMPILEDHEADERS
#include "TileEngine All.h"
#else
#include "worlddef.h"
#include "worldman.h"
#include "wcheck.h"
@@ -15,7 +12,6 @@
#include "random.h"
// sevenfm
#include "PATHAI.H"
#endif
extern BOOLEAN gfBasement;