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
-5
View File
@@ -1,7 +1,3 @@
#ifdef PRECOMPILEDHEADERS
#include "Tactical All.h"
#include "PreBattle Interface.h"
#else
#include "sgp.h"
#include "air raid.h"
#include "game event hook.h"
@@ -31,7 +27,6 @@
#include "Map screen helicopter.h"
#include "structure wrap.h"
#include "meanwhile.h"
#endif
#include "GameInitOptionsScreen.h"
-4
View File
@@ -1,6 +1,3 @@
#ifdef PRECOMPILEDHEADERS
#include "Tactical All.h"
#else
#include <stdio.h>
#include <string.h>
@@ -12,7 +9,6 @@
#include "Animation Data.h"
#include "Animation Control.h"
#include "Debug Control.h"
#endif
#define EMPTY_CACHE_ENTRY 65000
-4
View File
@@ -1,6 +1,3 @@
#ifdef PRECOMPILEDHEADERS
#include "Tactical All.h"
#else
#include "builddefines.h"
#include <stdio.h>
#include <string.h>
@@ -18,7 +15,6 @@
#include "Debug Control.h"
#include "Random.h"
#include "Soldier Control.h"
#endif
#include "connect.h"
-4
View File
@@ -1,6 +1,3 @@
#ifdef PRECOMPILEDHEADERS
#include "Tactical All.h"
#else
#include "builddefines.h"
#include <stdio.h>
#include <string.h>
@@ -17,7 +14,6 @@
#include "utilities.h"
#include "worlddef.h"
#include "Fileman.h"
#endif
//forward declarations of common classes to eliminate includes
class OBJECTTYPE;
+1 -5
View File
@@ -1,6 +1,3 @@
#ifdef PRECOMPILEDHEADERS
#include "Tactical All.h"
#else
#include "Types.h"
#include "stdlib.h"
#include "Arms Dealer Init.h"
@@ -19,7 +16,6 @@
#include "GameSettings.h"
#include "Overhead.h" // added by Flugente for MercPtrs[]
#include "LuaInitNPCs.h" // added by Flugente
#endif
#ifdef JA2UB
#include "Explosion Control.h"
@@ -2507,4 +2503,4 @@ BOOLEAN CanThisItemBeSoldToSimulatedCustomer( UINT8 ubArmsDealerID, UINT16 usIte
return( TRUE );
}
#endif
#endif
-4
View File
@@ -1,6 +1,3 @@
#ifdef PRECOMPILEDHEADERS
#include "Tactical All.h"
#else
#include "Types.h"
#include "ArmsDealerInvInit.h"
//#include "Item Types.h"
@@ -16,7 +13,6 @@
#include "Shopkeeper Interface.h"
#include "connect.h"
#include "Rebel Command.h"
#endif
//forward declarations of common classes to eliminate includes
class OBJECTTYPE;
-4
View File
@@ -1,6 +1,3 @@
#ifdef PRECOMPILEDHEADERS
#include "Tactical All.h"
#else
#include "sgp.h"
#include "overhead.h"
#include "messageboxscreen.h"
@@ -28,7 +25,6 @@
#include "cursors.h"
#include "English.h"
#include "SkillCheck.h" // added by Flugente
#endif
#include "Music Control.h"
-4
View File
@@ -1,6 +1,3 @@
#ifdef PRECOMPILEDHEADERS
#include "Tactical All.h"
#else
#include "Soldier Control.h"
#include "Overhead.h"
#include "Boxing.h"
@@ -25,7 +22,6 @@
#include "Font Control.h"
#include "message.h"
#include "GameSettings.h" // added by SANDRO
#endif
INT32 gsBoxerGridNo[ NUM_BOXERS ] = { 11393, 11233, 11073 };
UINT8 gubBoxerID[ NUM_BOXERS ] = { NOBODY, NOBODY, NOBODY };
-4
View File
@@ -1,6 +1,3 @@
#ifdef PRECOMPILEDHEADERS
#include "Tactical All.h"
#else
#include "builddefines.h"
#include <wchar.h>
#include <stdio.h>
@@ -37,7 +34,6 @@
#include "Strategic AI.h"
#include "interface Dialogue.h"
#include "DynamicDialogue.h"
#endif
#ifdef JA2UB
#include "Explosion Control.h"
-4
View File
@@ -1,6 +1,3 @@
#ifdef PRECOMPILEDHEADERS
#include "Tactical All.h"
#else
#include "builddefines.h"
#include <stdio.h>
#include "Types.h"
@@ -32,7 +29,6 @@
#include "NPC.h"
#include "Strategic Mines.h"
#include "Random.h"
#endif
#include "connect.h"
// for enemy taunts
-5
View File
@@ -1,7 +1,3 @@
#ifdef PRECOMPILEDHEADERS
#include "Tactical All.h"
#include "PreBattle Interface.h"
#else
#include "sgp.h"
//#include "soldier control.h"
#include "Encrypted File.h"
@@ -55,7 +51,6 @@
#include "los.h"
#include "qarray.h"
#include "Soldier Profile.h"
#endif
#include <vector>
#include "Auto Resolve.h"
-9
View File
@@ -1,11 +1,3 @@
#ifdef PRECOMPILEDHEADERS
#include "AI All.h"
#include "DisplayCover.h"
#include "Interface.h"
#include "opplist.h"
#include "_Ja25Englishtext.h"
//#include "Ja25 Strategic Ai.h"
#else
#include "builddefines.h"
#include "Types.h"
#include "Isometric Utils.h"
@@ -35,7 +27,6 @@
#include "soldier profile type.h"
#include "Interface Cursors.h" // added by Flugente for UICursorDefines
#include "Rebel Command.h"
#endif
//forward declarations of common classes to eliminate includes
class OBJECTTYPE;
-4
View File
@@ -1,6 +1,3 @@
#ifdef PRECOMPILEDHEADERS
#include "Tactical All.h"
#else
#include "sgp.h"
#include "soldier control.h"
#include "soldier profile.h"
@@ -17,7 +14,6 @@
#include "Animation data.h" // added by Flugente for SoldierBodyTypes
#include "CampaignStats.h" // added by Flugente
#include "DynamicDialogue.h"// added by Flugente
#endif
//forward declarations of common classes to eliminate includes
class OBJECTTYPE;
-6
View File
@@ -1,8 +1,3 @@
#ifdef PRECOMPILEDHEADERS
#include "Tactical All.h"
#include "PreBattle Interface.h"
#include "Intro.h"
#else
#include "Overhead.h"
#include "Render Fun.h"
@@ -38,7 +33,6 @@
#include "Campaign Types.h"
#include "Tactical Save.h"
#include "screenids.h"
#endif
#ifdef JA2UB
#include "email.h"
-5
View File
@@ -1,7 +1,3 @@
#ifdef PRECOMPILEDHEADERS
#include "Tactical All.h"
#include "Enemy Soldier Save.h"
#else
#include "builddefines.h"
#include "GameSettings.h"
#include <stdio.h>
@@ -33,7 +29,6 @@
#include "Queen Command.h"
#include "Scheduling.h"
#include "Soldier macros.h" // added by Flugente
#endif
#include "GameVersion.h"
//ADB When a savegame is loaded, the enemy and civ stuff needs to be loaded and updated, but this can only happen
-4
View File
@@ -1,10 +1,6 @@
#ifdef PRECOMPILEDHEADERS
#include "Tactical All.h"
#else
#include "Types.h"
#include "DEbug.h"
#include "EnemyItemDrops.h"
#endif
WEAPON_DROPS gEnemyWeaponDrops[MAX_DROP_ITEMS];
AMMO_DROPS gEnemyAmmoDrops[MAX_DROP_ITEMS];
-4
View File
@@ -1,6 +1,3 @@
#ifdef PRECOMPILEDHEADERS
#include "Tactical All.h"
#else
#include "builddefines.h"
#include "math.h"
#include <stdio.h>
@@ -43,7 +40,6 @@
#include "Food.h" // added by Flugente
#include "Queen Command.h" // added by Flugente for FindUnderGroundSector(...)
#include "strategic.h" // added by Flugente
#endif
#ifdef JA2UB
#include "Ja25_Tactical.h"
-4
View File
@@ -1,6 +1,3 @@
#ifdef PRECOMPILEDHEADERS
#include "Tactical All.h"
#else
#include <math.h>
#include "sgp.h"
#include "soldier profile.h"
@@ -26,7 +23,6 @@
#include "Soldier macros.h"
#include "strategicmap.h"
#include "DynamicDialogue.h" // added by Flugente
#endif
//forward declarations of common classes to eliminate includes
class OBJECTTYPE;
-4
View File
@@ -1,6 +1,3 @@
#ifdef PRECOMPILEDHEADERS
#include "Tactical All.h"
#else
#include "builddefines.h"
#include "debug.h"
#include "types.h"
@@ -10,7 +7,6 @@
#include "soundman.h"
#include <stdio.h>
#include "FileMan.h"
#endif
SUBSEQUENTSOUNDS subsequentsounds;
-5
View File
@@ -1,7 +1,3 @@
#ifdef PRECOMPILEDHEADERS
#include "Tactical All.h"
#include "language defines.h"
#else
#include "builddefines.h"
#include <stdio.h>
#include <time.h>
@@ -35,7 +31,6 @@
#include "Soldier macros.h"
#include "Event Pump.h"
#include "GameSettings.h"
#endif
#include "fresh_header.h"
#include "connect.h"
-4
View File
@@ -1,7 +1,4 @@
#include "connect.h"
#ifdef PRECOMPILEDHEADERS
#include "Tactical All.h"
#else
#include "items.h"
#include "Action Items.h"
#include "handle Items.h"
@@ -81,7 +78,6 @@
#include "MessageBoxScreen.h" // added by Flugente
#include "Map Screen Interface.h" // added by Flugente
#include "Map Screen Interface Map.h" // added by Flugente
#endif
#ifdef JA2UB
#include "Ja25_Tactical.h"
-4
View File
@@ -1,6 +1,3 @@
#ifdef PRECOMPILEDHEADERS
#include "Tactical All.h"
#else
#include "Handle UI Plan.h"
#include "overhead.h"
#include "Isometric Utils.h"
@@ -13,7 +10,6 @@
#include "message.h"
#include "soldier create.h"
#include "interface.h"
#endif
UINT8 gubNumUIPlannedMoves = 0;
SOLDIERTYPE *gpUIPlannedSoldier = NULL;
-6
View File
@@ -1,9 +1,4 @@
#include "connect.h"
#ifdef PRECOMPILEDHEADERS
#include "Tactical All.h"
#include "BuildDefines.h"
#else
#include "builddefines.h"
#include <stdio.h>
#include <string.h>
@@ -86,7 +81,6 @@
#include "Soldier Control.h"
#include "DisplayCover.h"
#include "english.h" // sevenfm: this is needed for _keydown(SHIFT) to work
#endif
#include "teamturns.h"
#include "Options Screen.h"
-4
View File
@@ -1,6 +1,3 @@
#ifdef PRECOMPILEDHEADERS
#include "Tactical All.h"
#else
#include <stdio.h>
#include <time.h>
#include <math.h>
@@ -48,7 +45,6 @@
#include "civ quotes.h"
#include "GameSettings.h"
#include "Explosion Control.h" // added by Flugente
#endif
#include "connect.h"
#include "Text.h"
-4
View File
@@ -1,6 +1,3 @@
#ifdef PRECOMPILEDHEADERS
#include "Tactical All.h"
#else
#include <stdio.h>
#include <time.h>
#include "sgp.h"
@@ -19,7 +16,6 @@
#include "overhead.h"
#include "interface items.h"
#include "GameSettings.h"
#endif
#define DISPLAY_AP_INDEX MOCKFLOOR1
-5
View File
@@ -1,7 +1,3 @@
#ifdef PRECOMPILEDHEADERS
#include "Tactical All.h"
#include "PreBattle Interface.h"
#else
#include "builddefines.h"
#include <stdio.h>
#include "sgp.h"
@@ -75,7 +71,6 @@
#include "Cheats.h"
#include "Overhead.h"
#include "Soldier Control.h"
#endif
#include "LuaInitNPCs.h"
#include "Text.h"
-5
View File
@@ -1,7 +1,3 @@
#ifdef PRECOMPILEDHEADERS
#include "Tactical All.h"
#include "language defines.h"
#else
#include "builddefines.h"
#include <stdio.h>
#include <time.h>
@@ -57,7 +53,6 @@
#include "los.h"
#include "Map Screen Interface Map.h"
#include "Food.h" // added by Flugente
#endif
#include "Multi Language Graphic Utils.h"
-5
View File
@@ -1,7 +1,3 @@
#ifdef PRECOMPILEDHEADERS
#include "Tactical All.h"
#include "language defines.h"
#else
#include "builddefines.h"
#include "mapscreen.h"
#include <stdio.h>
@@ -85,7 +81,6 @@
// sevenfm:
#include "Soldier Control.h"
#include "Sound Control.h"
#endif
#include "Multi Language Graphic Utils.h"
-4
View File
@@ -1,6 +1,3 @@
#ifdef PRECOMPILEDHEADERS
#include "Tactical All.h"
#else
#include "builddefines.h"
#include <stdio.h>
#include <time.h>
@@ -73,7 +70,6 @@
// HEADROCK HAM 3.6: This is required for Stat Progress Bars
#include "Campaign.h"
#include "Food.h" // added by Flugente
#endif
//legion by Jazz
#include "Interface Utils.h"
-4
View File
@@ -1,6 +1,3 @@
#ifdef PRECOMPILEDHEADERS
#include "Tactical All.h"
#else
#include "builddefines.h"
#include <stdio.h>
#include "sgp.h"
@@ -20,7 +17,6 @@
#include "Vehicles.h"
#include "GameSettings.h"
#include "Utilities.h" // added by Flugente
#endif
#define LIFE_BAR_SHADOW FROMRGB( 108, 12, 12 )
#define LIFE_BAR FROMRGB( 200, 0, 0 )
-4
View File
@@ -1,6 +1,3 @@
#ifdef PRECOMPILEDHEADERS
#include "Tactical All.h"
#else
#include "builddefines.h"
#include <stdio.h>
#include <stdarg.h>
@@ -65,7 +62,6 @@
#include "SkillCheck.h" // added by Flugente
#include "Drugs And Alcohol.h" // sevenfm
#include "english.h" // sevenfm
#endif
#include "InterfaceItemImages.h"
#ifdef JA2UB
-4
View File
@@ -1,6 +1,3 @@
#ifdef PRECOMPILEDHEADERS
#include "Tactical All.h"
#else
#include <memory.h>
#include "Inventory Choosing.h"
#include "animation data.h"
@@ -21,7 +18,6 @@
#include "Tactical Save.h" // added by Flugente
#include "Soldier macros.h" // added by Flugente
#include "Rebel Command.h"
#endif
extern WorldItems gAllWorldItems;
/*
-4
View File
@@ -1,6 +1,3 @@
#ifdef PRECOMPILEDHEADERS
#include "Tactical All.h"
#else
#include "items.h"
#include "Action Items.h"
#include "weapons.h"
@@ -61,7 +58,6 @@
#include "DisplayCover.h" // added by Flugente
#include "Map Information.h"
#include "ai.h" // added by Flugente
#endif
#ifdef JA2UB
#include "Ja25_Tactical.h"
-4
View File
@@ -1,6 +1,3 @@
#ifdef PRECOMPILEDHEADERS
#include "Tactical All.h"
#else
#include "items.h"
#include "weapons.h"
#include "Soldier Control.h"
@@ -36,7 +33,6 @@
#include "utilities.h"
#include "english.h"
#include "debug control.h"
#endif
#ifdef JA2UB
#include "worldman.h"
-4
View File
@@ -1,6 +1,3 @@
#ifdef PRECOMPILEDHEADERS
#include "Tactical All.h"
#else
#include "builddefines.h"
#include <stdio.h>
#include <memory.h>
@@ -40,7 +37,6 @@
#include "Map Screen Interface.h"
#include "GameSettings.h" // added by SANDRO
#include "Dialogue Control.h" // added by Flugente
#endif
#include "GameVersion.h"
-4
View File
@@ -1,7 +1,4 @@
#include "connect.h"
#ifdef PRECOMPILEDHEADERS
#include "Tactical All.h"
#else
#include "builddefines.h"
#include <stdio.h>
@@ -44,7 +41,6 @@
#include "items.h"
#include "Item Types.h"
#include "Vehicles.h"
#endif
#include "fresh_header.h"
#include "WorldDat.h"
// HEADROCK HAM 3.6: This must be included, for testing whether Bloodcats and Enemies can see one another.
-5
View File
@@ -1,7 +1,3 @@
#ifdef PRECOMPILEDHEADERS
#include "Tactical All.h"
#include "edit_sys.h"
#else
#include <stdio.h>
#include "fileMan.h"
#include "types.h"
@@ -20,7 +16,6 @@
#include "environment.h"
#include "lighting.h"
#include "Animated ProgressBar.h"
#endif
//CHRISL: MAJOR_MAP_VERSION information moved to worlddef.h by ADB. We're using these values elsewhere and need them
// in the header file
-4
View File
@@ -1,6 +1,3 @@
#ifdef PRECOMPILEDHEADERS
#include "Tactical All.h"
#else
#include "builddefines.h"
#include <stdio.h>
#include <string.h>
@@ -41,7 +38,6 @@
// HEADROCK HAM 3.5: Need this to see if enemies present at starting sector
#include "Overhead.h"
#include "Map Information.h" // added by Flugente
#endif
#ifdef JA2UB
#include "ub_config.h"
-5
View File
@@ -1,7 +1,3 @@
#ifdef PRECOMPILEDHEADERS
#include "Tactical All.h"
#include "strategic.h"
#else
#include "builddefines.h"
#include <stdio.h>
#include <string.h>
@@ -53,7 +49,6 @@
#include "GameSettings.h"
#include "DynamicDialogue.h"// added by Flugente
#include "Dialogue Control.h" // added by Flugente
#endif
#include "connect.h"
#ifdef JA2UB
-5
View File
@@ -1,7 +1,3 @@
#ifdef PRECOMPILEDHEADERS
#include "Tactical All.h"
#include "PreBattle Interface.h"
#else
#include "Militia Control.h"
#include "Town Militia.h"
@@ -33,7 +29,6 @@
#include "MilitiaSquads.h"
#include "MilitiaIndividual.h" // added by Flugente
#include "CampaignStats.h" // added by Flugente
#endif
//forward declarations of common classes to eliminate includes
class OBJECTTYPE;
-4
View File
@@ -1,6 +1,3 @@
#ifdef PRECOMPILEDHEADERS
#include "Tactical All.h"
#else
#include <stdlib.h>
#include "Morale.h"
#include "Overhead.h"
@@ -32,7 +29,6 @@
#include "Soldier Add.h" // added by Flugente for MERC_TYPE__AIM_MERC
#include "CampaignStats.h" // added by Flugente for gCurrentIncident
#include "DynamicDialogue.h" // added by Flugente
#endif
#include "connect.h"
#include "fresh_header.h"
+1
View File
@@ -2,6 +2,7 @@
#define __OVERHEAD_TYPES_H
// GLOBAL HEADER FOR DATA, TYPES FOR TACTICAL ENGINE
#include "Types.h"
#define REFINE_AIM_1 0
#define REFINE_AIM_MID1 1
-7
View File
@@ -1,9 +1,3 @@
#ifdef PRECOMPILEDHEADERS
#include "Tactical All.h"
#include "PreBattle Interface.h"
#include "creature spreading.h"
#include "Lua Interpreter.h"
#else
#include <stdio.h>
#include <string.h>
#include "wcheck.h"
@@ -118,7 +112,6 @@
#include "MilitiaIndividual.h" // added by Flugente
#include "Rebel Command.h"
#include "MilitiaSquads.h"
#endif
#include "connect.h"
#include "Luaglobal.h"
-4
View File
@@ -8,9 +8,6 @@
Date : 1997-NOV
*/
#ifdef PRECOMPILEDHEADERS
#include "Tactical All.h"
#else
#include <stdio.h>
#include <string.h>
#include "stdlib.h"
@@ -44,7 +41,6 @@
#include "AIinternals.h"
#include "Rotting Corpses.h"
#include "Meanwhile.h"
#endif
#include "connect.h"
#include "LOS.h" //ddd
-4
View File
@@ -1,6 +1,3 @@
#ifdef PRECOMPILEDHEADERS
#include "Tactical All.h"
#else
#include "sgp.h"
#include "worlddef.h"
#include "points.h"
@@ -39,7 +36,6 @@
#include "Food.h" // added by Flugente
#include "AIInternals.h" //dnl ch69 150913
#include "CampaignStats.h" // added by Flugente
#endif
#include "connect.h"
#include "GameInitOptionsScreen.h"
-4
View File
@@ -1,9 +1,5 @@
#ifdef PRECOMPILEDHEADERS
#include "Tactical All.h"
#else
#include "sgp.h"
#include "qarray.h"
#endif
QARRAY_VALUES QuoteExp[NUM_PROFILES];
-4
View File
@@ -1,6 +1,3 @@
#ifdef PRECOMPILEDHEADERS
#include "Tactical All.h"
#else
#include "types.h"
//#include "soldier control.h"
#include "overhead.h"
@@ -41,7 +38,6 @@
#include "line.h"
#include "overhead map.h"
#include "interface dialogue.h"
#endif
#include "Rain.h"
-4
View File
@@ -1,6 +1,3 @@
#ifdef PRECOMPILEDHEADERS
#include "Tactical All.h"
#else
#include <stdio.h>
#include <string.h>
#include "stdlib.h"
@@ -11,7 +8,6 @@
#include "Random.h"
#include "Campaign.h"
#endif
#include "XML.h"
-4
View File
@@ -1,6 +1,3 @@
#ifdef PRECOMPILEDHEADERS
#include "Tactical All.h"
#else
#include <stdio.h>
#include <string.h>
#include "stdlib.h"
@@ -65,7 +62,6 @@
#include "Vehicles.h" // anv: for switching from soldier to vehicle
#include "VehicleMenu.h"
#endif
//forward declarations of common classes to eliminate includes
-4
View File
@@ -1,6 +1,3 @@
#ifdef PRECOMPILEDHEADERS
#include "Tactical All.h"
#else
#include "builddefines.h"
#include <stdio.h>
#include <string.h>
@@ -50,7 +47,6 @@
#include "ai.h" // added by Flugente
#include "PreBattle Interface.h" // added by Flugente
#include "Strategic Town Loyalty.h" // added by Flugente
#endif
#include "Animation Control.h"
-4
View File
@@ -1,6 +1,3 @@
#ifdef PRECOMPILEDHEADERS
#include "Tactical All.h"
#else
#include "Types.h"
#include "ShopKeeper Interface.h"
#include "Utilities.h"
@@ -55,7 +52,6 @@
#include "Encyclopedia_new.h"
#include "Animation Control.h" // added by Flugente
#include "Town Militia.h" // added by Flugente
#endif
#ifdef JA2UB
#include "Explosion Control.h"
-4
View File
@@ -1,6 +1,3 @@
#ifdef PRECOMPILEDHEADERS
#include "Tactical All.h"
#else
#include "SkillCheck.h"
#include "Soldier Profile.h"
#include "Random.h"
@@ -18,7 +15,6 @@
#include "Soldier Control.h"
#include "Interface.h" // added by Flugente for zBackground
#include "DynamicDialogue.h" // added by Flugente
#endif
extern void ReducePointsForHunger( SOLDIERTYPE *pSoldier, UINT32 *pusPoints );
-4
View File
@@ -1,6 +1,3 @@
#ifdef PRECOMPILEDHEADERS
#include "Tactical All.h"
#else
#include "sgp.h"
#include "overhead.h"
@@ -26,7 +23,6 @@
#include "Vehicles.h" // added by Flugente
#include "CampaignStats.h" // added by Flugente
#include "worldman.h" // added by Flugente for Water(...)
#endif
#ifdef JA2UB
#include "Ja25 Strategic Ai.h"
-4
View File
@@ -1,6 +1,3 @@
#ifdef PRECOMPILEDHEADERS
#include "Tactical All.h"
#else
#include <stdio.h>
#include <string.h>
#include "stdlib.h"
@@ -67,7 +64,6 @@
#include "Town Militia.h" // added by Flugente
#include "PreBattle Interface.h" // added by Flugente
#include "Rebel Command.h"
#endif
// anv: for enemy taunts
#include "Civ Quotes.h"
-4
View File
@@ -1,6 +1,3 @@
#ifdef PRECOMPILEDHEADERS
#include "Tactical All.h"
#else
#include "builddefines.h"
#include <wchar.h>
#include <stdio.h>
@@ -103,7 +100,6 @@
#include "LuaInitNPCs.h" // added by Flugente
#include "SaveLoadMap.h" // added by Flugente
#include "qarray.h" // added by Flugente
#endif
#include "ub_config.h"
#include "../ModularizedTacticalAI/include/Plan.h" // for plan destructor call
-6
View File
@@ -1,8 +1,3 @@
#ifdef PRECOMPILEDHEADERS
#include "Tactical All.h"
#include "PreBattle Interface.h"
#include "saveloadgame.h"
#else
#include "sgp.h"
#include "Soldier Create.h"
#include "overhead.h"
@@ -48,7 +43,6 @@
#include "Soldier macros.h" // added by Flugente
#include "MilitiaIndividual.h" // added by Flugente
#include "Rebel Command.h"
#endif
#include "connect.h"
#include "message.h"
-4
View File
@@ -1,6 +1,3 @@
#ifdef PRECOMPILEDHEADERS
#include "Tactical All.h"
#else
#include <stdio.h>
#include <string.h>
#include "stdlib.h"
@@ -43,7 +40,6 @@
#include "Vehicles.h"
#include "GameSettings.h"
#include "ui cursors.h"
#endif
BOOLEAN IsGridNoInScreenRect( INT32 sGridNo, SGPRect *pRect );
-4
View File
@@ -1,6 +1,3 @@
#ifdef PRECOMPILEDHEADERS
#include "Tactical All.h"
#else
#include "builddefines.h"
#include <stdio.h>
#include <memory.h>
@@ -46,7 +43,6 @@
#include "screenids.h"
#include "SaveLoadScreen.h"
#include "Rotting Corpses.h"
#endif
#include "connect.h"
#include "Map Edgepoints.h"
-4
View File
@@ -1,6 +1,3 @@
#ifdef PRECOMPILEDHEADERS
#include "Tactical All.h"
#else
#include <stdio.h>
#include <string.h>
#include "stdlib.h"
@@ -52,7 +49,6 @@
#include "drugs and alcohol.h" // added by Flugente
#include "Campaign.h"
#include "LuaInitNPCs.h" // added by Flugente
#endif
#include "aim.h"
#include "AimFacialIndex.h"
-4
View File
@@ -1,6 +1,3 @@
#ifdef PRECOMPILEDHEADERS
#include "Tactical All.h"
#else
#include <wchar.h>
#include <stdio.h>
#include <string.h>
@@ -49,7 +46,6 @@
#include "Text.h"
#include "NPC.h"
#include "Soldier macros.h"
#endif
extern UINT8 gubWaitingForAllMercsToExitCode;
-4
View File
@@ -1,6 +1,3 @@
#ifdef PRECOMPILEDHEADERS
#include "Tactical All.h"
#else
#include "Types.h"
#include "Windows.h"
//#include "Soldier Control.h"
@@ -33,7 +30,6 @@
#include "Map Screen Interface.h"
#include "cheats.h"
#include "Drugs and Alcohol.h"
#endif
//forward declarations of common classes to eliminate includes
class OBJECTTYPE;
-4
View File
@@ -1,6 +1,3 @@
#ifdef PRECOMPILEDHEADERS
#include "Tactical All.h"
#else
#include <stdio.h>
#include <string.h>
#include "stdlib.h"
@@ -15,7 +12,6 @@
#include "interface.h"
#include "spread burst.h"
#include "points.h"
#endif
//forward declarations of common classes to eliminate includes
class OBJECTTYPE;
-4
View File
@@ -1,6 +1,3 @@
#ifdef PRECOMPILEDHEADERS
#include "Tactical All.h"
#else
#include "Types.h"
#include "Squads.h"
#include "Strategic Pathing.h"
@@ -18,7 +15,6 @@
#include "screenids.h"
#include "Soldier macros.h"
#include "GameSettings.h"
#endif
#include <vector>
-6
View File
@@ -1,8 +1,3 @@
#ifdef PRECOMPILEDHEADERS
#include "Tactical All.h"
#include "PreBattle Interface.h"
#include "creature spreading.h"
#else
#include "builddefines.h"
#include <stdio.h>
#include "Button System.h"
@@ -35,7 +30,6 @@
#include "Quests.h"
#include "Creature Spreading.h"
#include "Queen Command.h" // added by Flugente
#endif
#ifdef JA2UB
#include "Explosion Control.h"
-4
View File
@@ -1,6 +1,3 @@
#ifdef PRECOMPILEDHEADERS
#include "Tactical All.h"
#else
#include <stdio.h>
#include "debug.h"
#include "worlddef.h"
@@ -13,7 +10,6 @@
#include "strategicmap.h"
#include "rotting corpses.h"
#include "WorldDat.h" // added by Flugente
#endif
extern BOOLEAN DoesSAMExistHere( INT16 sSectorX, INT16 sSectorY, INT16 sSectorZ, INT32 sGridNo );
-232
View File
@@ -1,232 +0,0 @@
#ifndef __TACTICAL_ALL_H
#define __TACTICAL_ALL_H
#pragma message("GENERATED PCH FOR TACTICAL PROJECT.")
#include "sgp.h"
#include "air raid.h"
#include "game event hook.h"
#include "game clock.h"
#include "auto bandage.h"
#include "strategicmap.h"
#include "screenids.h"
#include "jascreens.h"
#include "random.h"
#include "overhead types.h"
#include "sound control.h"
#include "timer control.h"
#include "dialogue control.h"
#include "overhead.h"
#include "message.h"
#include "isometric utils.h"
#include "soldier macros.h"
#include "worldman.h"
#include "los.h"
#include "math.h"
#include "explosion control.h"
#include "interface.h"
#include "music control.h"
#include "Campaign Types.h"
#include "GameSettings.h"
#include "text.h"
#include "Morale.h"
#include "Map screen helicopter.h"
#include <stdio.h>
#include <string.h>
#include "types.h"
#include "wcheck.h"
#include <stdlib.h>
#include "Animation Cache.h"
#include "Animation Data.h"
#include "Animation Control.h"
#include "sys globals.h"
#include "Debug Control.h"
#include "FileMan.h"
#include "weapons.h"
#include "structure.h"
#include "worlddef.h"
#include "rotting corpses.h"
#include "points.h"
#include "Soldier Control.h"
#include "tiledef.h"
#include "utilities.h"
#include "Arms Dealer Init.h"
#include "ArmsDealerInvInit.h"
#include "soldier profile.h"
#include "Handle Items.h"
#include "Item Types.h"
#include "messageboxscreen.h"
#include "Handle UI.h"
#include "items.h"
#include "MercTextBox.h"
#include "renderworld.h"
#include "strategic turns.h"
#include "Event Pump.h"
#include "ai.h"
#include "interface control.h"
#include "Map Screen Interface.h"
#include "Map Screen Interface Bottom.h"
#include "Assignments.h"
#include "WordWrap.h"
#include "cursors.h"
#include "English.h"
#include "Boxing.h"
#include "Render Fun.h"
#include "NPC.h"
#include "Opplist.h"
#include <errno.h>
#include "vsurface.h"
#include "Render Dirty.h"
#include "sysutil.h"
#include "container.h"
#include "video.h"
#include "vobject_blitters.h"
#include "faces.h"
#include "gap.h"
#include "Bullets.h"
#include <wchar.h>
#include "MemMan.h"
#include "campaign.h"
#include "Strategic Mines.h"
#include "Strategic Status.h"
#include "Encrypted File.h"
#include "mercs.h"
#include "interface dialogue.h"
#include "squads.h"
#include "interface utils.h"
#include "Quests.h"
#include "gamescreen.h"
#include "ShopKeeper Interface.h"
#include "Merc Contract.h"
#include "history.h"
#include "Town Militia.h"
#include "meanwhile.h"
#include "SkillCheck.h"
#include "finances.h"
#include "drugs and alcohol.h"
#include "teamturns.h"
#include "font control.h"
#include "line.h"
#include "structure wrap.h"
#include "pathai.h"
#include "smell.h"
#include "fov.h"
#include "keys.h"
#include "input.h"
#include "exit grids.h"
#include "environment.h"
#include "Fog Of War.h"
#include "soundman.h"
#include <stdarg.h>
#include <time.h>
#include "tile animation.h"
#include "Interactive Tiles.h"
#include "handle doors.h"
#include "Action Items.h"
#include "World items.h"
#include "interface items.h"
#include "physics.h"
#include "interface panels.h"
#include "Strategic Town Loyalty.h"
#include "soldier functions.h"
#include "SaveLoadMap.h"
#include "soldier add.h"
#include "soldier ani.h"
#include "qarray.h"
#include "Handle UI Plan.h"
#include "soldier create.h"
#include "mousesystem.h"
#include "cursor control.h"
#include "interface cursors.h"
#include "UI cursors.h"
#include "Strategic Pathing.h"
#include "strategic movement.h"
#include "strategic.h"
#include "vehicles.h"
#include "gameloop.h"
#include "himage.h"
#include "vobject.h"
#include "Button System.h"
#include "radar screen.h"
#include "lighting.h"
#include "Strategic Exit GUI.h"
#include "PopUpBox.h"
#include "spread burst.h"
#include "Tactical Save.h"
#include "fade screen.h"
#include "Strategic AI.h"
#include "mapscreen.h"
#include "LaptopSave.h"
#include "Map Screen Interface Map.h"
#include "Map Screen Interface Map Inventory.h"
#include "overhead map.h"
#include "Options Screen.h"
#include <memory.h>
#include "Inventory Choosing.h"
#include "Smoothing Utils.h"
#include "tiledat.h"
#include <math.h>
#include "phys math.h"
#include "Map Information.h"
#include "Soldier Init List.h"
#include "EditorMercs.h"
#include "ja2.h"
#include "Road Smoothing.h"
#include "tile cache.h"
#include "merc entering.h"
#include "Merc Hiring.h"
#include "Strategic Merc Handler.h"
#include "Militia Control.h"
#include "Queen Command.h"
#include "editscreen.h"
#include "soldier tile.h"
#ifdef NETWORKED
#include "Networking.h"
#include "NetworkEvent.h"
#endif
#include "Player Command.h"
#include "Game Init.h"
#include "Buildings.h"
#include "rt time defines.h"
#include "GameSettings.h"
#include "Text Input.h"
#include "ShopKeeper Quotes.h"
#include "Personnel.h"
#include "pits.h"
#include "Win util.h"
#include "smokeeffects.h"
#include "SaveLoadGame.h"
#include "Scheduling.h"
#include "Auto Resolve.h"
#include "soldier find.h"
#include "aim.h"
#include "strategic town reputation.h"
#include "Tactical Turns.h"
#include "lighteffects.h"
#include "timer.h"
#include "Soldier Profile Type.h"
#include "AIList.h"
#include "QuestDebug.h"
#include "Game Events.h"
#include "BobbyR.h"
#include "EnemyItemDrops.h"
#ifdef JA2BETAVERSION
#include "Quest Debug System.h"
#endif
#include "GameVersion.h"
#include "SaveLoadScreen.h"
#include "Cheats.h"
#include "Animated ProgressBar.h"
#include "civ quotes.h"
#include "AimMembers.h"
#include "BobbyRMailOrder.h"
#include "end game.h"
#include "DisplayCover.h"
#include "expat.h"
#include "spread burst.h"
#include "XML.h"
#endif
-5
View File
@@ -1,7 +1,3 @@
#ifdef PRECOMPILEDHEADERS
#include "Tactical All.h"
#include "Enemy Soldier Save.h"
#else
#include "Types.h"
#include "MemMan.h"
#include "message.h"
@@ -46,7 +42,6 @@
#include "screenids.h"
#include "Queen Command.h"
#include "Map Screen Interface Map Inventory.h"
#endif
#include "Animation Control.h"
#include <vfs/Core/vfs.h>
BOOLEAN gfWasInMeanwhile = FALSE;
-4
View File
@@ -1,6 +1,3 @@
#ifdef PRECOMPILEDHEADERS
#include "Tactical All.h"
#else
#include "sgp.h"
#include "Game Clock.h"
#include "Font Control.h"
@@ -28,7 +25,6 @@
#include "Random.h"
#include "Explosion Control.h"
#include "Dialogue Control.h" // added by Flugente
#endif
#include "Reinforcement.h"
-4
View File
@@ -654,10 +654,6 @@
RelativePath=".\Structure Wrap.h"
>
</File>
<File
RelativePath=".\Tactical All.h"
>
</File>
<File
RelativePath=".\Tactical Save.h"
>
-4
View File
@@ -658,10 +658,6 @@
RelativePath="Structure Wrap.h"
>
</File>
<File
RelativePath="Tactical All.h"
>
</File>
<File
RelativePath="Tactical Save.h"
>
-1
View File
@@ -115,7 +115,6 @@
<ClInclude Include="Squads.h" />
<ClInclude Include="Strategic Exit GUI.h" />
<ClInclude Include="Structure Wrap.h" />
<ClInclude Include="Tactical All.h" />
<ClInclude Include="Tactical Save.h" />
<ClInclude Include="Tactical Turns.h" />
<ClInclude Include="TeamTurns.h" />
-1
View File
@@ -237,7 +237,6 @@
<ClInclude Include="Structure Wrap.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="Tactical All.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="Tactical Save.h">
-1
View File
@@ -115,7 +115,6 @@
<ClInclude Include="Squads.h" />
<ClInclude Include="Strategic Exit GUI.h" />
<ClInclude Include="Structure Wrap.h" />
<ClInclude Include="Tactical All.h" />
<ClInclude Include="Tactical Save.h" />
<ClInclude Include="Tactical Turns.h" />
<ClInclude Include="TeamTurns.h" />
-1
View File
@@ -231,7 +231,6 @@
<ClInclude Include="Structure Wrap.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="Tactical All.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="Tactical Save.h">
-1
View File
@@ -115,7 +115,6 @@
<ClInclude Include="Squads.h" />
<ClInclude Include="Strategic Exit GUI.h" />
<ClInclude Include="Structure Wrap.h" />
<ClInclude Include="Tactical All.h" />
<ClInclude Include="Tactical Save.h" />
<ClInclude Include="Tactical Turns.h" />
<ClInclude Include="TeamTurns.h" />
-1
View File
@@ -231,7 +231,6 @@
<ClInclude Include="Structure Wrap.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="Tactical All.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="Tactical Save.h">
-1
View File
@@ -115,7 +115,6 @@
<ClInclude Include="Squads.h" />
<ClInclude Include="Strategic Exit GUI.h" />
<ClInclude Include="Structure Wrap.h" />
<ClInclude Include="Tactical All.h" />
<ClInclude Include="Tactical Save.h" />
<ClInclude Include="Tactical Turns.h" />
<ClInclude Include="TeamTurns.h" />
-1
View File
@@ -231,7 +231,6 @@
<ClInclude Include="Structure Wrap.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="Tactical All.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="Tactical Save.h">
-4
View File
@@ -1,6 +1,3 @@
#ifdef PRECOMPILEDHEADERS
#include "Tactical All.h"
#else
#include "types.h"
#include "overhead.h"
#include "animation control.h"
@@ -45,7 +42,6 @@
#include "Soldier Profile.h"
#include "NPC.h"
#include "drugs and alcohol.h" // added by Flugente
#endif
#ifdef JA2UB
#include "Ja25_Tactical.h"
-10
View File
@@ -1,12 +1,3 @@
#ifdef PRECOMPILEDHEADERS
#include "Tactical All.h"
#include "Language Defines.h"
#include "HelpScreen.h"
#include "Prebattle Interface.h"
#include "ambient control.h"
#include "DisplayCover.h"
#include "_Ja25Englishtext.h"
#else
#include "builddefines.h"
#include <stdio.h>
#include <string.h>
@@ -108,7 +99,6 @@
#include "Ambient Control.h"
#include "Strategic AI.h"
#include "VehicleMenu.h"
#endif
#include "Quest Debug System.h"
#include "connect.h"
-4
View File
@@ -1,6 +1,3 @@
#ifdef PRECOMPILEDHEADERS
#include "Tactical All.h"
#else
#include "items.h"
#include "weapons.h"
#include "Interface Cursors.h"
@@ -32,7 +29,6 @@
#include "SkillCheck.h" // added by SANDRO
#include "message.H" //ddd
#include "english.h" // added by Flugente
#endif
//forward declarations of common classes to eliminate includes
class OBJECTTYPE;
-4
View File
@@ -1,6 +1,3 @@
#ifdef PRECOMPILEDHEADERS
#include "Tactical All.h"
#else
#include "Vehicles.h"
#include "String.h"
#include "Strategic Pathing.h"
@@ -39,7 +36,6 @@
#include "Soldier ani.h"
#include "GameSettings.h"
#include "Queen Command.h"
#endif
#include "Points.h"
#include "Init.h"
-4
View File
@@ -1,6 +1,3 @@
#ifdef PRECOMPILEDHEADERS
#include "Tactical All.h"
#else
#include "sgp.h"
#include "overhead types.h"
#include "Sound Control.h"
@@ -54,7 +51,6 @@
#include "environment.h" // added by silversurfer
// sevenfm
#include "buildings.h" // SameBuilding
#endif
//forward declarations of common classes to eliminate includes
class OBJECTTYPE;
-4
View File
@@ -1,6 +1,3 @@
#ifdef PRECOMPILEDHEADERS
#include "Tactical All.h"
#else
#include "items.h"
#include "handle Items.h"
#include "overhead.h"
@@ -27,7 +24,6 @@
#include "message.h"
#include "map screen interface map inventory.h" // added by Flugente
#include "connect.h"
#endif
#ifdef JA2EDITOR//dnl ch84 290114
#include "Item Statistics.h"
#endif
@@ -1,12 +1,8 @@
#ifdef PRECOMPILEDHEADERS
#include "Tactical All.h"
#else
#include "sgp.h"
#include "Debug Control.h"
#include "expat.h"
#include "XML.h"
#include "Interface.h"
#endif
#include "tiledef.h"
-4
View File
@@ -1,6 +1,3 @@
#ifdef PRECOMPILEDHEADERS
#include "Tactical All.h"
#else
#include "sgp.h"
#include "overhead types.h"
#include "overhead.h"
@@ -8,7 +5,6 @@
#include "Debug Control.h"
#include "expat.h"
#include "XML.h"
#endif
struct
{
-4
View File
@@ -1,13 +1,9 @@
#ifdef PRECOMPILEDHEADERS
#include "Tactical All.h"
#else
#include "sgp.h"
#include "weapons.h"
#include "overhead.h"
#include "Debug Control.h"
#include "expat.h"
#include "XML.h"
#endif
// Flugente: remember how many ammotypes we read
UINT32 gMAXAMMOTYPES_READ = 0;
-4
View File
@@ -1,6 +1,3 @@
#ifdef PRECOMPILEDHEADERS
#include "Tactical All.h"
#else
#include "sgp.h"
#include "weapons.h"
#include "overhead.h"
@@ -8,7 +5,6 @@
#include "Debug Control.h"
#include "expat.h"
#include "XML.h"
#endif
struct
{
-4
View File
@@ -1,13 +1,9 @@
#ifdef PRECOMPILEDHEADERS
#include "Tactical All.h"
#else
#include "sgp.h"
#include "overhead.h"
#include "weapons.h"
#include "Debug Control.h"
#include "expat.h"
#include "XML.h"
#endif
struct
{
-4
View File
@@ -1,13 +1,9 @@
#ifdef PRECOMPILEDHEADERS
#include "Tactical All.h"
#else
#include "sgp.h"
#include "overhead.h"
#include "weapons.h"
#include "Debug Control.h"
#include "expat.h"
#include "XML.h"
#endif
UINT16 LAST_SLOT_INDEX = 0;
-4
View File
@@ -1,6 +1,3 @@
#ifdef PRECOMPILEDHEADERS
#include "Tactical All.h"
#else
#include "sgp.h"
#include "overhead.h"
#include "weapons.h"
@@ -8,7 +5,6 @@
#include "expat.h"
#include "gamesettings.h"
#include "XML.h"
#endif
struct
{
-4
View File
@@ -1,12 +1,8 @@
#ifdef PRECOMPILEDHEADERS
#include "Tactical All.h"
#else
#include "sgp.h"
#include "Debug Control.h"
#include "expat.h"
#include "XML.h"
#include "Interface.h"
#endif
struct
{
-4
View File
@@ -1,6 +1,3 @@
#ifdef PRECOMPILEDHEADERS
#include "Tactical All.h"
#else
#include "sgp.h"
#include "overhead types.h"
#include "Sound Control.h"
@@ -36,7 +33,6 @@
#include "Debug Control.h"
#include "expat.h"
#include "XML.h"
#endif
struct
{
-4
View File
@@ -1,12 +1,8 @@
#ifdef PRECOMPILEDHEADERS
#include "Tactical All.h"
#else
#include "sgp.h"
#include "Debug Control.h"
#include "expat.h"
#include "XML.h"
#include "Interface.h"
#endif
struct
{
-4
View File
@@ -1,12 +1,8 @@
#ifdef PRECOMPILEDHEADERS
#include "Tactical All.h"
#else
#include "sgp.h"
#include "overhead.h"
#include "Debug Control.h"
#include "expat.h"
#include "XML.h"
#endif
struct
{
-4
View File
@@ -1,13 +1,9 @@
#ifdef PRECOMPILEDHEADERS
#include "Tactical All.h"
#else
#include "sgp.h"
#include "overhead.h"
#include "weapons.h"
#include "Debug Control.h"
#include "expat.h"
#include "XML.h"
#endif
struct
{
-4
View File
@@ -1,13 +1,9 @@
#ifdef PRECOMPILEDHEADERS
#include "Tactical All.h"
#else
#include "sgp.h"
#include "overhead.h"
#include "weapons.h"
#include "Debug Control.h"
#include "expat.h"
#include "XML.h"
#endif
struct
{
-4
View File
@@ -1,13 +1,9 @@
#ifdef PRECOMPILEDHEADERS
#include "Tactical All.h"
#else
#include "sgp.h"
#include "overhead.h"
#include "Disease.h"
#include "Debug Control.h"
#include "expat.h"
#include "XML.h"
#endif
struct
{
-4
View File
@@ -1,13 +1,9 @@
#ifdef PRECOMPILEDHEADERS
#include "Tactical All.h"
#else
#include "sgp.h"
#include "overhead.h"
#include "Drugs And Alcohol.h"
#include "Debug Control.h"
#include "expat.h"
#include "XML.h"
#endif
struct
{
-4
View File
@@ -1,13 +1,9 @@
#ifdef PRECOMPILEDHEADERS
#include "Tactical All.h"
#else
#include "sgp.h"
#include "overhead.h"
#include "weapons.h"
#include "Debug Control.h"
#include "expat.h"
#include "XML.h"
#endif
struct
{

Some files were not shown because too many files have changed in this diff Show More