From 03edc532e1936534c98f4785928069193e1e5037 Mon Sep 17 00:00:00 2001 From: Asdow <20314541+Asdow@users.noreply.github.com> Date: Mon, 8 Dec 2025 21:40:57 +0200 Subject: [PATCH] Clean up Strategic/*:cpp includes --- Strategic/AI Viewer.cpp | 2 -- Strategic/ASD.cpp | 22 +------------------ Strategic/Game Event Hook.cpp | 1 - Strategic/Game Init.cpp | 4 ++-- Strategic/Ja25 Strategic Ai.cpp | 2 +- Strategic/Map Screen Interface Border.cpp | 5 ----- Strategic/Map Screen Interface Bottom.cpp | 2 -- .../Map Screen Interface Map Inventory.cpp | 5 ----- Strategic/Map Screen Interface Map.cpp | 5 ----- .../Map Screen Interface TownMine Info.cpp | 11 ++-------- Strategic/Map Screen Interface.cpp | 4 ---- Strategic/MapScreen Quotes.cpp | 4 ++-- Strategic/Meanwhile.cpp | 2 -- Strategic/Merc Contract.cpp | 7 +----- Strategic/MilitiaSquads.cpp | 12 +--------- Strategic/MiniEvents.cpp | 5 ----- Strategic/Player Command.cpp | 3 --- Strategic/PreBattle Interface.cpp | 6 +---- Strategic/Queen Command.cpp | 4 +--- Strategic/Quest Debug System.cpp | 2 -- Strategic/Quests.cpp | 3 --- Strategic/Reinforcement.cpp | 11 +--------- Strategic/Scheduling.cpp | 1 - Strategic/Strategic AI.cpp | 4 ---- Strategic/Strategic Event Handler.cpp | 11 +--------- Strategic/Strategic Merc Handler.cpp | 7 ------ Strategic/Strategic Mines LUA.cpp | 1 - Strategic/Strategic Mines.cpp | 4 ---- Strategic/Strategic Movement.cpp | 3 --- Strategic/Strategic Pathing.cpp | 8 +------ Strategic/Strategic Town Loyalty.cpp | 6 ----- Strategic/Strategic Turns.cpp | 14 ++---------- Strategic/Town Militia.cpp | 4 ---- Strategic/UndergroundInit.cpp | 2 -- Strategic/XML_Bloodcats.cpp | 1 - Strategic/XML_Facilities.cpp | 2 +- Strategic/XML_FacilityTypes.cpp | 1 - Strategic/XML_Minerals.cpp | 1 - Strategic/XML_SquadNames.cpp | 3 +-- Strategic/XML_UniformColors.cpp | 2 -- Strategic/mapscreen.cpp | 12 ---------- Strategic/strategic town reputation.cpp | 2 -- Strategic/strategic.cpp | 10 +-------- Strategic/strategicmap.cpp | 19 ++-------------- 44 files changed, 22 insertions(+), 218 deletions(-) diff --git a/Strategic/AI Viewer.cpp b/Strategic/AI Viewer.cpp index 75d3eccc..bdd006a2 100644 --- a/Strategic/AI Viewer.cpp +++ b/Strategic/AI Viewer.cpp @@ -8,7 +8,6 @@ #include "vsurface.h" #include "Button System.h" #include "Font Control.h" - #include "Editor Taskbar Utils.h" #include "line.h" #include "input.h" #include "vobject_blitters.h" @@ -16,7 +15,6 @@ #include "mousesystem.h" #include "strategicmap.h" #include "FileMan.h" - #include "Map Information.h" #include "Render Dirty.h" #include "Game Clock.h" #include "Campaign Types.h" diff --git a/Strategic/ASD.cpp b/Strategic/ASD.cpp index f461cb80..bc60c0bc 100644 --- a/Strategic/ASD.cpp +++ b/Strategic/ASD.cpp @@ -6,35 +6,18 @@ #include #include "ASD.h" #include "strategic.h" -#include "WCheck.h" -#include "Utilities.h" -#include "WordWrap.h" -#include "Cursors.h" -#include "line.h" -#include "Insurance Text.h" -#include "Encrypted File.h" #include "Text.h" -#include "Multi Language Graphic Utils.h" #include "random.h" #include "Interface.h" -#include "Soldier Add.h" -#include "Soldier Profile.h" #include "Overhead.h" -#include "Map Screen Interface.h" -#include "finances.h" +#include #include "Game Clock.h" #include "SaveLoadGame.h" -#include "GameVersion.h" #include "message.h" #include "Game Event Hook.h" -#include "Militia Control.h" #include "Town Militia.h" -#include "Strategic Town Loyalty.h" -#include "Map Information.h" #include "Campaign.h" -#include "random.h" -#include "Explosion Control.h" #include "Strategic AI.h" #include "Strategic Mines.h" #include "Reinforcement.h" @@ -42,9 +25,6 @@ #include "Queen Command.h" #include "Map Screen Helicopter.h" #include "Points.h" -#include "worldman.h" -#include "Map Information.h" -#include "opplist.h" #include "Dialogue Control.h" #include "Sound Control.h" #include "renderworld.h" diff --git a/Strategic/Game Event Hook.cpp b/Strategic/Game Event Hook.cpp index 8d2222c7..2e7e3801 100644 --- a/Strategic/Game Event Hook.cpp +++ b/Strategic/Game Event Hook.cpp @@ -4,7 +4,6 @@ #include "environment.h" #include "Ambient Control.h" #include "Quests.h" -// #include "Sound Control.h" #include "AimMembers.h" #include "Strategic Event Handler.h" #include "BobbyR.h" diff --git a/Strategic/Game Init.cpp b/Strategic/Game Init.cpp index 0a605b32..6d08e9ee 100644 --- a/Strategic/Game Init.cpp +++ b/Strategic/Game Init.cpp @@ -9,9 +9,9 @@ #include "Soldier Profile.h" #include "strategicmap.h" #include "Game Init.h" - #include "finances.h" + #include "finances.h" #include "Soldier Create.h" - #include "strategic.h" + #include "strategic.h" #include "history.h" #include "merc entering.h" #include "Squads.h" diff --git a/Strategic/Ja25 Strategic Ai.cpp b/Strategic/Ja25 Strategic Ai.cpp index ba702f01..611ac771 100644 --- a/Strategic/Ja25 Strategic Ai.cpp +++ b/Strategic/Ja25 Strategic Ai.cpp @@ -1,3 +1,4 @@ +#ifdef JA2UB #include "builddefines.h" #include "strategicmap.h" @@ -68,7 +69,6 @@ #include "Auto Resolve.h" #include "Cursors.h" -#ifdef JA2UB #include "Soldier Init List.h" #include "Dialogue Control.h" #include "Game Clock.h" diff --git a/Strategic/Map Screen Interface Border.cpp b/Strategic/Map Screen Interface Border.cpp index c538d8ab..c2132110 100644 --- a/Strategic/Map Screen Interface Border.cpp +++ b/Strategic/Map Screen Interface Border.cpp @@ -11,21 +11,16 @@ #include "mapscreen.h" #include "Render Dirty.h" #include "Map Screen Interface Map.h" - #include "Map Screen Interface Border.h" #include "Map Screen Interface.h" #include "Map Screen Interface Map Inventory.h" #include "Map Screen Helicopter.h" #include "Text.h" - #include "Campaign Types.h" - #include "Strategic Town Loyalty.h" - #include "strategicmap.h" #include "Assignments.h" // HEADROCK HAM 4: Now accepts INI settings #include "GameSettings.h" // Also include Quests, for checking whether a fact is true. #include "Quests.h" // HEADROCK HAM 5: Required for inventory filter popup - #include "popup_callback.h" #include "popup_class.h" #include "Queen Command.h" // added by Flugente diff --git a/Strategic/Map Screen Interface Bottom.cpp b/Strategic/Map Screen Interface Bottom.cpp index 04aa27db..60efc984 100644 --- a/Strategic/Map Screen Interface Bottom.cpp +++ b/Strategic/Map Screen Interface Bottom.cpp @@ -22,10 +22,8 @@ #include "Options Screen.h" #include "Cursor Control.h" #include "gameloop.h" - #include "ai.h" #include "Tactical Save.h" #include "Campaign Types.h" - #include "Air Raid.h" #include "finances.h" #include "LaptopSave.h" #include "Interface Items.h" diff --git a/Strategic/Map Screen Interface Map Inventory.cpp b/Strategic/Map Screen Interface Map Inventory.cpp index 5dc77414..41c7a82e 100644 --- a/Strategic/Map Screen Interface Map Inventory.cpp +++ b/Strategic/Map Screen Interface Map Inventory.cpp @@ -1,7 +1,6 @@ #include "Map Screen Interface Map Inventory.h" #include "Render Dirty.h" #include "vobject.h" - #include "Utilities.h" #include "WCheck.h" #include "sysutil.h" #include "Map Screen Interface Border.h" @@ -28,7 +27,6 @@ #include "WordWrap.h" #include "Soldier macros.h" #include "rt time defines.h" - #include "Encyclopedia_new.h" //Moa: item visibility #include "Town Militia.h" // added by Flugente #include "ShopKeeper Interface.h" @@ -36,10 +34,7 @@ #include #include "InterfaceItemImages.h" #include "SaveLoadGame.h"//dnl ch51 081009 -#include "Map Information.h"//dnl ch51 091009 -#include "Interface Items.h" #include "Food.h" // added by Flugente -#include "Campaign Types.h" // added by Flugente #include "mapscreen.h" //forward declarations of common classes to eliminate includes diff --git a/Strategic/Map Screen Interface Map.cpp b/Strategic/Map Screen Interface Map.cpp index 846b2bfd..74196c45 100644 --- a/Strategic/Map Screen Interface Map.cpp +++ b/Strategic/Map Screen Interface Map.cpp @@ -19,7 +19,6 @@ #include "Squads.h" #include "message.h" #include "Soldier Profile.h" - #include "Player Command.h" #include "Strategic Movement.h" #include "Queen Command.h" #include "Campaign Types.h" @@ -28,7 +27,6 @@ #include "Vehicles.h" #include "Map Screen Helicopter.h" #include "Game Clock.h" - #include "finances.h" #include "line.h" #include "english.h" #include "PreBattle Interface.h" @@ -39,7 +37,6 @@ #include "Tactical Save.h" #include "Map Information.h" #include "Air Raid.h" - #include "Auto Resolve.h" #include "ASD.h" // added by Flugente #include "MilitiaIndividual.h" // added by Flugente #include "Map Screen Interface Map Inventory.h" // added by Flugente @@ -50,10 +47,8 @@ #include "Quests.h" #include "connect.h" -#include "Strategic Mines.h" // HEADROCK HAM 3.5: included for detectionlevels #include "Facilities.h" -#include "MilitiaSquads.h" #include "LaptopSave.h" #include diff --git a/Strategic/Map Screen Interface TownMine Info.cpp b/Strategic/Map Screen Interface TownMine Info.cpp index 3168f3d8..0fa52b77 100644 --- a/Strategic/Map Screen Interface TownMine Info.cpp +++ b/Strategic/Map Screen Interface TownMine Info.cpp @@ -5,19 +5,15 @@ #include "Queen Command.h" #include "Player Command.h" #include "Font Control.h" - #include "Font.h" #include "Text.h" #include "Map Screen Interface Map.h" #include "Map Screen Interface Border.h" - #include "Handle UI.h" - #include "NPC.h" #include "Strategic Town Loyalty.h" #include "Strategic Mines.h" - #include "finances.h" #include "Map Screen Interface Map Inventory.h" #include "strategic.h" #include "Utilities.h" - #include "video.h" + #include #include "Town Militia.h" #include "HelpScreen.h" #include "Map Screen Helicopter.h" @@ -25,10 +21,7 @@ #include "GameSettings.h" #include "DEBUG.H" #include "Overhead.h" // added by Flugente - #include "Game Clock.h" // added by Flugente - #include "Game Event Hook.h" // added by Flugente - -#include "Strategic Mines.h" + #define BOX_BUTTON_WIDTH 100 #define BOX_BUTTON_HEIGHT 20 diff --git a/Strategic/Map Screen Interface.cpp b/Strategic/Map Screen Interface.cpp index b133c100..b7ef4678 100644 --- a/Strategic/Map Screen Interface.cpp +++ b/Strategic/Map Screen Interface.cpp @@ -1,5 +1,4 @@ #include "Map Screen Interface.h" - #include "string.h" #include "Map Screen Interface Map.h" #include "Render Dirty.h" #include "Font Control.h" @@ -28,7 +27,6 @@ #include "Vehicles.h" #include "line.h" #include "Text.h" - #include "gameloop.h" #include "Map Screen Helicopter.h" #include "PreBattle Interface.h" #include "WordWrap.h" @@ -46,11 +44,9 @@ #include "Game Init.h" #include "Strategic Mines.h" #include "finances.h" - #include "strategic.h" #include "Air Raid.h" #include "Queen Command.h" #include "Render Fun.h" - #include "Food.h" #include "personnel.h" #include "mapscreen.h" diff --git a/Strategic/MapScreen Quotes.cpp b/Strategic/MapScreen Quotes.cpp index 72cb6375..0438d839 100644 --- a/Strategic/MapScreen Quotes.cpp +++ b/Strategic/MapScreen Quotes.cpp @@ -1,4 +1,5 @@ - #include "Map Screen Interface.h" +#ifdef JA2UB +#include "Map Screen Interface.h" #include "string.h" #include "Map Screen Interface Map.h" #include "Font Control.h" @@ -47,7 +48,6 @@ #include "connect.h" - #ifdef JA2UB #include "Ja25 Strategic Ai.h" #include "Ja25_Tactical.h" diff --git a/Strategic/Meanwhile.cpp b/Strategic/Meanwhile.cpp index 5b58a30a..ceb30426 100644 --- a/Strategic/Meanwhile.cpp +++ b/Strategic/Meanwhile.cpp @@ -13,8 +13,6 @@ #include "Soldier Profile.h" #include "Overhead.h" #include "Dialogue Control.h" - #include "gameloop.h" - #include "NPC.h" #include "Assignments.h" #include "strategic.h" #include "Text.h" diff --git a/Strategic/Merc Contract.cpp b/Strategic/Merc Contract.cpp index 040d9df0..3f0ac34b 100644 --- a/Strategic/Merc Contract.cpp +++ b/Strategic/Merc Contract.cpp @@ -9,8 +9,6 @@ #include "Soldier Add.h" #include "Dialogue Control.h" #include "Soldier Create.h" - #include "message.h" - #include "Font Control.h" #include "personnel.h" #include "LaptopSave.h" #include "Map Screen Interface.h" @@ -18,8 +16,7 @@ #include "strategicmap.h" #include "Quests.h" #include "worlddef.h" - #include "Animation Control.h" - #include "Tactical Save.h" + #include #include "Interface Control.h" #include "gamescreen.h" #include "jascreens.h" @@ -27,10 +24,8 @@ #include "Assignments.h" #include "Strategic Movement.h" #include "Squads.h" - #include "gameloop.h" #include "Text.h" #include "Strategic Status.h" - #include "mercs.h" #include "insurance Contract.h" #include "Vehicles.h" #include "email.h" diff --git a/Strategic/MilitiaSquads.cpp b/Strategic/MilitiaSquads.cpp index 26df9005..f1e0369f 100644 --- a/Strategic/MilitiaSquads.cpp +++ b/Strategic/MilitiaSquads.cpp @@ -4,25 +4,15 @@ #include "strategic.h" #include "strategicmap.h" #include "Overhead.h" - #include "Strategic Town Loyalty.h" - #include "Utilities.h" #include "random.h" #include "Text.h" - #include "Map Screen Interface.h" - #include "Interface.h" - #include "LaptopSave.h" + #include #include "Game Clock.h" #include "Assignments.h" - #include "Squads.h" - #include "Soldier Create.h" - #include "Dialogue Control.h" #include "GameSettings.h" #include "Queen Command.h" #include "math.h" #include "Auto Resolve.h" - #include "Vehicles.h" - #include "Tactical Save.h" - #include "Campaign.h" #include "message.h" #include "mapscreen.h" #include "Strategic Pathing.h" diff --git a/Strategic/MiniEvents.cpp b/Strategic/MiniEvents.cpp index 21e4660e..7ab75a28 100644 --- a/Strategic/MiniEvents.cpp +++ b/Strategic/MiniEvents.cpp @@ -37,20 +37,15 @@ to call into. #include "strategicmap.h" #include "Strategic Movement.h" #include "Strategic Town Loyalty.h" -#include "Text.h" #include "Town Militia.h" #include "Vehicles.h" extern "C" { #include "lua.h" -#include "lauxlib.h" -#include "lualib.h" } -#include #include #include -#include extern CHAR16 gzUserDefinedButton1[ 128 ]; extern CHAR16 gzUserDefinedButton2[ 128 ]; diff --git a/Strategic/Player Command.cpp b/Strategic/Player Command.cpp index eac292de..009f766b 100644 --- a/Strategic/Player Command.cpp +++ b/Strategic/Player Command.cpp @@ -8,7 +8,6 @@ #include "LaptopSave.h" #include "Quests.h" #include "Morale.h" - #include "Overhead.h" #include "strategicmap.h" #include "Map Screen Helicopter.h" #include "Game Clock.h" @@ -20,8 +19,6 @@ #include "PreBattle Interface.h" #include "Map Screen Interface.h" #include "Tactical Save.h" - #include "interface Dialogue.h" - #include "random.h" // HEADROCK HAM 3.6: Added for facility string printing... #include "PopUpBox.h" #include "CampaignStats.h" // added by Flugente diff --git a/Strategic/PreBattle Interface.cpp b/Strategic/PreBattle Interface.cpp index 46ecb0e1..1a47ac90 100644 --- a/Strategic/PreBattle Interface.cpp +++ b/Strategic/PreBattle Interface.cpp @@ -16,7 +16,6 @@ #include "Strategic Pathing.h" #include "Text.h" #include "PopUpBox.h" - #include "Player Command.h" #include "Cursors.h" #include "Auto Resolve.h" #include "Sound Control.h" @@ -24,7 +23,6 @@ #include "Map Screen Interface Bottom.h" #include "Overhead.h" #include "Tactical Placement GUI.h" - #include "Town Militia.h" #include "Campaign.h" #include "GameSettings.h" #include "random.h" @@ -41,15 +39,13 @@ #include "Soldier macros.h" #include "history.h" #include "Cheats.h" - // added by SANDRO #include "Tactical Save.h" #include "message.h" #include "CampaignStats.h" // added by Flugente #include "MilitiaSquads.h" // added by Flugente #include "SkillCheck.h" // added by Flugente #include "Strategic Transport Groups.h" - #include "Utilities.h" - + #ifdef JA2UB #include "ub_config.h" #endif diff --git a/Strategic/Queen Command.cpp b/Strategic/Queen Command.cpp index f09964de..160705ac 100644 --- a/Strategic/Queen Command.cpp +++ b/Strategic/Queen Command.cpp @@ -1,7 +1,6 @@ //Queen Command.c #include "Queen Command.h" - #include "Strategic Event Handler.h" #include "Overhead Types.h" #include "strategicmap.h" #include "Soldier Init List.h" @@ -9,7 +8,7 @@ #include "random.h" #include "Strategic Movement.h" #include "Overhead.h" - #include "Strategic Pathing.h" + #include #include "strategic.h" #include "message.h" #include "Map Edgepoints.h" @@ -33,7 +32,6 @@ #include "Animation Data.h" #include "Game Clock.h" #include "renderworld.h" - #include "Town Militia.h" #include "Dialogue Control.h" #include "Campaign Init.h" #include "Meanwhile.h" diff --git a/Strategic/Quest Debug System.cpp b/Strategic/Quest Debug System.cpp index 9641524c..2608ec30 100644 --- a/Strategic/Quest Debug System.cpp +++ b/Strategic/Quest Debug System.cpp @@ -22,13 +22,11 @@ #include "Soldier Add.h" #include "opplist.h" #include "Handle Items.h" - #include "Game Clock.h" #include "environment.h" #include "Dialogue Control.h" //#include "Soldier Control.h" #include "Overhead.h" #include "MessageBoxScreen.h" - #include "stdio.h" #include "english.h" #include "line.h" #include "Keys.h" diff --git a/Strategic/Quests.cpp b/Strategic/Quests.cpp index 399a20f3..81844658 100644 --- a/Strategic/Quests.cpp +++ b/Strategic/Quests.cpp @@ -8,12 +8,10 @@ #include "Handle Items.h" #include "Overhead.h" #include "interface Dialogue.h" - #include "Soldier Profile.h" #include "Isometric Utils.h" #include "Render Fun.h" #include "history.h" #include "Map Screen Helicopter.h" - #include "Overhead.h" #include "Strategic Mines.h" #include "Boxing.h" #include "Campaign Types.h" @@ -22,7 +20,6 @@ #include "Campaign.h" #include "GameSettings.h" #include "Arms Dealer Init.h" - #include "GameSettings.h" #include "random.h" #include "Assignments.h" #include "strategic.h" diff --git a/Strategic/Reinforcement.cpp b/Strategic/Reinforcement.cpp index c7738869..f4b37f15 100644 --- a/Strategic/Reinforcement.cpp +++ b/Strategic/Reinforcement.cpp @@ -1,20 +1,11 @@ #include "Town Militia.h" #include "Militia Control.h" #include "Campaign Types.h" - #include "strategic.h" + #include "mapscreen.h" #include "strategicmap.h" #include "Overhead.h" - #include "Strategic Town Loyalty.h" - #include "Utilities.h" #include "random.h" - #include "Text.h" - #include "Map Screen Interface.h" - #include "Interface.h" - #include "LaptopSave.h" - #include "Assignments.h" - #include "Squads.h" #include "Soldier Create.h" - #include "Dialogue Control.h" #include "Queen Command.h" #include "GameSettings.h" #include "Soldier Init List.h" diff --git a/Strategic/Scheduling.cpp b/Strategic/Scheduling.cpp index a7f996e2..2fcb666b 100644 --- a/Strategic/Scheduling.cpp +++ b/Strategic/Scheduling.cpp @@ -1,4 +1,3 @@ - #include #include "FileMan.h" #include "types.h" #include "Scheduling.h" diff --git a/Strategic/Strategic AI.cpp b/Strategic/Strategic AI.cpp index 17a0f648..77fb2ed0 100644 --- a/Strategic/Strategic AI.cpp +++ b/Strategic/Strategic AI.cpp @@ -13,7 +13,6 @@ #include "strategicmap.h" #include "Game Clock.h" #include "strategic.h" - #include "Explosion Control.h" #include "Town Militia.h" #include "Overhead.h" #include "Squads.h" @@ -26,15 +25,12 @@ #include "Campaign Init.h" #include "Game Init.h" #include "PreBattle Interface.h" - #include "Quests.h" #include "Soldier Profile.h" #include "Scheduling.h" #include "Map Information.h" #include "interface Dialogue.h" #include "ASD.h" // added by Flugente #include "Rebel Command.h" - #include "Game Event Hook.h" - #include "Strategic Town Loyalty.h" #include "Strategic Transport Groups.h" #include "GameInitOptionsScreen.h" diff --git a/Strategic/Strategic Event Handler.cpp b/Strategic/Strategic Event Handler.cpp index 7ea0e689..1e57e316 100644 --- a/Strategic/Strategic Event Handler.cpp +++ b/Strategic/Strategic Event Handler.cpp @@ -1,9 +1,7 @@ #include "Strategic Event Handler.h" - #include "MemMan.h" - #include "message.h" + #include #include "Items.h" #include "Handle Items.h" - #include "LaptopSave.h" #include "Tactical Save.h" #include "strategicmap.h" #include "Quests.h" @@ -14,12 +12,6 @@ #include "random.h" #include "Overhead.h" #include "Strategic Town Loyalty.h" - #include "Soldier Init List.h" - #include "SaveLoadMap.h" - #include "Soldier Create.h" - #include "Soldier Add.h" - #include "renderworld.h" - #include "Soldier Profile.h" #include "email.h" #include "strategic.h" #include "GameSettings.h" @@ -30,7 +22,6 @@ #include "Rebel Command.h" #include "Luaglobal.h" -#include "connect.h" #include "LuaInitNPCs.h" //forward declarations of common classes to eliminate includes diff --git a/Strategic/Strategic Merc Handler.cpp b/Strategic/Strategic Merc Handler.cpp index 2499b70f..ba8fa47c 100644 --- a/Strategic/Strategic Merc Handler.cpp +++ b/Strategic/Strategic Merc Handler.cpp @@ -16,7 +16,6 @@ #include "mercs.h" #include "Mapscreen.h" #include "Weapons.h" - #include "personnel.h" #include "Strategic Movement.h" #include "LaptopSave.h" #include "message.h" @@ -25,23 +24,17 @@ #include "strategic.h" #include "strategicmap.h" #include "Strategic Status.h" - #include "aim.h" #include "email.h" #include "Map Screen Interface.h" #include "Campaign.h" #include "Soldier Add.h" #include "screenids.h" - #include "gameloop.h" #include "jascreens.h" #include "Soldier macros.h" #include "finances.h" #include "GameSettings.h" #include "Quests.h" - // HEADROCK HAM B1: Additional Include for Dynamic Roaming Restrictions - #include "MilitiaSquads.h" - // HEADROCK HAM 3.6: Additional include for Facility Operating Deby #include "Facilities.h" - // HEADROCK HAM 3.6: And another include, for militia upkeep costs. #include "Town Militia.h" #include "DynamicDialogue.h" // added by Flugente for HandleDynamicOpinionsDailyRefresh() diff --git a/Strategic/Strategic Mines LUA.cpp b/Strategic/Strategic Mines LUA.cpp index 45f1fb51..04156184 100644 --- a/Strategic/Strategic Mines LUA.cpp +++ b/Strategic/Strategic Mines LUA.cpp @@ -13,7 +13,6 @@ #include "Strategic Mines.h" #include "Strategic Mines LUA.h" #include "UndergroundInit.h" -#include // for CBasicException #include "connect.h" diff --git a/Strategic/Strategic Mines.cpp b/Strategic/Strategic Mines.cpp index 93f4cd27..3f156d3d 100644 --- a/Strategic/Strategic Mines.cpp +++ b/Strategic/Strategic Mines.cpp @@ -1,18 +1,15 @@ - #include #include "Strategic Mines.h" #include "finances.h" #include "Strategic Town Loyalty.h" #include "strategic.h" #include "Game Clock.h" #include "strategicmap.h" - #include "random.h" #include "Soldier Profile.h" #include "Dialogue Control.h" #include "Map Screen Interface.h" #include "Quests.h" #include "Creature Spreading.h" #include "message.h" - #include "Text.h" #include "Game Event Hook.h" #include "GameSettings.h" #include "Strategic AI.h" @@ -22,7 +19,6 @@ #include "ASD.h" // added by Flugente #include "Rebel Command.h" -#include "GameInitOptionsScreen.h" #include "Strategic Mines LUA.h" #include diff --git a/Strategic/Strategic Movement.cpp b/Strategic/Strategic Movement.cpp index 9ee5a7e3..b97fe3e5 100644 --- a/Strategic/Strategic Movement.cpp +++ b/Strategic/Strategic Movement.cpp @@ -1,6 +1,5 @@ #include "builddefines.h" #include - #include #include "Strategic Movement.h" #include "MemMan.h" #include "DEBUG.H" @@ -34,7 +33,6 @@ #include "Tactical Save.h" #include "Player Command.h" #include "Strategic AI.h" - #include "Town Militia.h" #include "Music Control.h" #include "Campaign.h" #include "Isometric Utils.h" @@ -53,7 +51,6 @@ #include "Strategic Transport Groups.h" #include "MilitiaSquads.h" -#include "Vehicles.h" #ifdef JA2UB #include "Ja25Update.h" diff --git a/Strategic/Strategic Pathing.cpp b/Strategic/Strategic Pathing.cpp index 117f47d0..d8001ca7 100644 --- a/Strategic/Strategic Pathing.cpp +++ b/Strategic/Strategic Pathing.cpp @@ -1,24 +1,18 @@ - #include - #include #include "types.h" #include "worlddef.h" - #include "sgp.h" + #include #include "strategic.h" #include "mapscreen.h" - #include "Overhead.h" #include "strategicmap.h" #include "Strategic Pathing.h" - #include "Map Screen Interface Border.h" #include "Game Clock.h" #include "Strategic Movement.h" #include "Campaign Types.h" #include "Assignments.h" - #include "Squads.h" #include "Vehicles.h" #include "Map Screen Helicopter.h" #include "input.h" #include "english.h" - #include "Map Screen Interface.h" #include "Game Event Hook.h" #include "Strategic AI.h" #include "Queen Command.h" // added by Flugente diff --git a/Strategic/Strategic Town Loyalty.cpp b/Strategic/Strategic Town Loyalty.cpp index dd4a613b..87c9d37d 100644 --- a/Strategic/Strategic Town Loyalty.cpp +++ b/Strategic/Strategic Town Loyalty.cpp @@ -8,7 +8,6 @@ #include "Queen Command.h" #include "Animation Data.h" #include "Quests.h" - #include "Font.h" #include "message.h" #include "LOS.h" #include "World Items.h" @@ -18,9 +17,7 @@ #include "random.h" #include "Strategic Movement.h" #include "Strategic Pathing.h" - #include "Vehicles.h" #include "Game Clock.h" - #include "Game Event Hook.h" #include "Morale.h" #include "GameSettings.h" #include "Text.h" @@ -29,9 +26,6 @@ #include "history.h" #include "Meanwhile.h" #include "Strategic Status.h" - // HEADROCK HAM B1: Added include for Dynamic Roaming Militia - #include "MilitiaSquads.h" - // HEADROCK HAM 3.6: Include for Facility Debt #include "Facilities.h" #include "CampaignStats.h" // added by Flugente #include "DynamicDialogue.h" // added by Flugente diff --git a/Strategic/Strategic Turns.cpp b/Strategic/Strategic Turns.cpp index 3dd8c124..43899201 100644 --- a/Strategic/Strategic Turns.cpp +++ b/Strategic/Strategic Turns.cpp @@ -1,22 +1,12 @@ #include "sgp.h" #include "Game Clock.h" - #include "Font Control.h" #include "Timer Control.h" #include "Overhead.h" - #include "Game Clock.h" - #include "message.h" - #include "worlddef.h" - #include "Soldier Create.h" - #include "Soldier Add.h" + #include #include "Strategic Turns.h" - #include "Isometric Utils.h" - #include "Animation Data.h" - #include "Animation Control.h" #include "Tactical Turns.h" - #include "Strategic Turns.h" #include "rt time defines.h" - #include "Assignments.h" - + diff --git a/Strategic/Town Militia.cpp b/Strategic/Town Militia.cpp index 742ba47d..4a08666a 100644 --- a/Strategic/Town Militia.cpp +++ b/Strategic/Town Militia.cpp @@ -7,7 +7,6 @@ #include "strategicmap.h" #include "Overhead.h" #include "Strategic Town Loyalty.h" - #include "Utilities.h" #include "random.h" #include "Text.h" #include "Map Screen Interface.h" @@ -16,8 +15,6 @@ #include "finances.h" #include "Game Clock.h" #include "Assignments.h" - #include "Squads.h" - #include "Soldier Create.h" #include "Dialogue Control.h" #include "GameSettings.h" #include "Queen Command.h" @@ -39,7 +36,6 @@ #include "Soldier Control.h" #include "soldier profile type.h" -#include "MilitiaSquads.h" #define SIZE_OF_MILITIA_COMPLETED_TRAINING_LIST 50 // temporary local global variables diff --git a/Strategic/UndergroundInit.cpp b/Strategic/UndergroundInit.cpp index f2feac82..607b3804 100644 --- a/Strategic/UndergroundInit.cpp +++ b/Strategic/UndergroundInit.cpp @@ -9,8 +9,6 @@ extern "C" { #include "lua.h" -#include "lauxlib.h" -#include "lualib.h" } #include "lua_state.h" diff --git a/Strategic/XML_Bloodcats.cpp b/Strategic/XML_Bloodcats.cpp index c0d26715..13115fe9 100644 --- a/Strategic/XML_Bloodcats.cpp +++ b/Strategic/XML_Bloodcats.cpp @@ -7,7 +7,6 @@ #include "FileMan.h" #include "MemMan.h" #include "Debug Control.h" - #include "mapscreen.h" #define MAX_CHAR_DATA_LENGTH 500 diff --git a/Strategic/XML_Facilities.cpp b/Strategic/XML_Facilities.cpp index 198e61e1..b83fb925 100644 --- a/Strategic/XML_Facilities.cpp +++ b/Strategic/XML_Facilities.cpp @@ -11,7 +11,7 @@ #include "sgp.h" #include "Debug Control.h" #include "expat.h" - #include "GameSettings.h" + #include #include "XML.h" #include "FileMan.h" #include "Campaign Types.h" diff --git a/Strategic/XML_FacilityTypes.cpp b/Strategic/XML_FacilityTypes.cpp index 60e96453..eb8692ab 100644 --- a/Strategic/XML_FacilityTypes.cpp +++ b/Strategic/XML_FacilityTypes.cpp @@ -16,7 +16,6 @@ #include "XML.h" #include "FileMan.h" #include "Campaign Types.h" - #include "Facilities.h" FACILITYTYPE gFacilityTypes[ MAX_NUM_FACILITY_TYPES ]; UINT16 NUM_FACILITY_TYPES = 0; diff --git a/Strategic/XML_Minerals.cpp b/Strategic/XML_Minerals.cpp index 70d72c0f..bdc08903 100644 --- a/Strategic/XML_Minerals.cpp +++ b/Strategic/XML_Minerals.cpp @@ -2,7 +2,6 @@ #include "Debug Control.h" #include "expat.h" #include "XML.h" - #include "Interface.h" #include "Map Screen Interface Map.h" struct diff --git a/Strategic/XML_SquadNames.cpp b/Strategic/XML_SquadNames.cpp index 63734fa9..dee0125b 100644 --- a/Strategic/XML_SquadNames.cpp +++ b/Strategic/XML_SquadNames.cpp @@ -1,6 +1,5 @@ #include "sgp.h" - #include "Map Screen Interface.h" - #include "Overhead.h" + #include #include "Debug Control.h" #include "expat.h" #include "XML.h" diff --git a/Strategic/XML_UniformColors.cpp b/Strategic/XML_UniformColors.cpp index 442e1312..9acd9f8f 100644 --- a/Strategic/XML_UniformColors.cpp +++ b/Strategic/XML_UniformColors.cpp @@ -13,11 +13,9 @@ #include "XML.h" #include "expat.h" #include "string.h" - #include "Campaign Types.h" #include "FileMan.h" #include "MemMan.h" #include "Debug Control.h" - #include "mapscreen.h" #define MAX_CHAR_DATA_LENGTH 500 diff --git a/Strategic/mapscreen.cpp b/Strategic/mapscreen.cpp index db81f46b..1067b25c 100644 --- a/Strategic/mapscreen.cpp +++ b/Strategic/mapscreen.cpp @@ -1,7 +1,6 @@ #include "mapscreen.h" #include #include - #include #include "gameloop.h" #include "sgp.h" #include "vobject.h" @@ -17,12 +16,9 @@ #include "Font Control.h" #include "Timer Control.h" #include "Interface.h" - #include "Handle UI.h" #include "Interface Items.h" #include "Interface Utils.h" - #include "lighting.h" #include - #include #include "Cursors.h" #include "Soldier Profile.h" #include "Interface Panels.h" @@ -60,7 +56,6 @@ #include "Dialogue Control.h" #include "Map Screen Interface TownMine Info.h" #include "PreBattle Interface.h" - #include "personnel.h" #include "Animated ProgressBar.h" #include "Queen Command.h" #include "LaptopSave.h" @@ -74,11 +69,9 @@ #include "Strategic Mines.h" #include "SaveLoadScreen.h" #include "Options Screen.h" - #include "Auto Resolve.h" #include "Meanwhile.h" #include "Campaign.h" #include "random.h" - #include "Air Raid.h" #include "Quests.h" #include "Town Militia.h" #include "Weapons.h" @@ -98,13 +91,8 @@ #include "Strategic Status.h" #include "Soldier Create.h" #include "Animation Control.h" - // HEADROCK HAM 3.6: Include facilities for assignment display - #include "Facilities.h" - // HEADROCK HAM 4: Include Militia Squads for Manual Militia Restrictions toggle. #include "MilitiaSquads.h" #include "Auto Bandage.h" // added by Flugente - #include "Food.h" // added by Flugente - #include "Drugs And Alcohol.h" // added by Flugente #include "WordWrap.h" #include "connect.h" //hayden diff --git a/Strategic/strategic town reputation.cpp b/Strategic/strategic town reputation.cpp index 4ef2b90e..f65c4a06 100644 --- a/Strategic/strategic town reputation.cpp +++ b/Strategic/strategic town reputation.cpp @@ -1,9 +1,7 @@ #include "types.h" #include "strategic town reputation.h" #include "soldier profile type.h" - #include "Game Event Hook.h" #include "Soldier Profile.h" - #include "Overhead.h" #include "Game Clock.h" #include "Strategic Town Loyalty.h" #include "DEBUG.H" diff --git a/Strategic/strategic.cpp b/Strategic/strategic.cpp index f60076e8..0a757d45 100644 --- a/Strategic/strategic.cpp +++ b/Strategic/strategic.cpp @@ -1,24 +1,16 @@ #include "strategic.h" #include "types.h" #include "Squads.h" - #include "jascreens.h" #include "Assignments.h" #include "Interface Control.h" #include "Overhead.h" #include "Soldier Profile.h" #include "Dialogue Control.h" - #include "personnel.h" #include "Tactical Save.h" #include "Isometric Utils.h" #include "Vehicles.h" #include "Game Clock.h" - #include "CampaignStats.h" // added by Flugente - #include "MilitiaSquads.h" // added by Flugente - #include "Game Event Hook.h" // added by Flugente - #include "message.h" // added by Flugente - #include "Text.h" // added by Flugente - #include "Queen Command.h" // added by Flugente - + #ifdef JA2UB #else // anv: for playable Speck diff --git a/Strategic/strategicmap.cpp b/Strategic/strategicmap.cpp index 2779929c..e3f97a0f 100644 --- a/Strategic/strategicmap.cpp +++ b/Strategic/strategicmap.cpp @@ -4,11 +4,7 @@ #include "strategic.h" #include "Strategic Mines.h" #include "types.h" -#include "memory.h" #include -#include -#include -#include #include "jascreens.h" #include "worlddef.h" #include "Soldier Control.h" @@ -16,13 +12,11 @@ #include "Interface Panels.h" #include "Isometric Utils.h" #include "Ambient Control.h" -#include "worlddef.h" #include "WorldDat.h" #include "Text.h" #include "Soldier Add.h" #include "Soldier macros.h" #include "Strategic Pathing.h" -#include "Soldier Create.h" #include "Handle UI.h" #include "faces.h" #include "renderworld.h" @@ -36,7 +30,7 @@ #include "message.h" #include "Font Control.h" #include "environment.h" -#include "Game Events.h" +#include "Game Event Hook.h" #include "Quests.h" #include "FileMan.h" #include "Animated ProgressBar.h" @@ -51,7 +45,6 @@ #include "Animation Control.h" #include "Squads.h" #include "worldman.h" -#include "Overhead.h" #include "Strategic Town Loyalty.h" #include "Queen Command.h" #include "Cursor Control.h" @@ -66,11 +59,8 @@ #include "Tactical Placement GUI.h" #include "Map Screen Helicopter.h" #include "Map Edgepoints.h" -#include "Player Command.h" #include "Event Pump.h" #include "Meanwhile.h" -#include "Air Raid.h" -#include "Strategic Mines.h" #include "Creature Spreading.h" #include "SaveLoadMap.h" #include "Militia Control.h" @@ -84,12 +74,9 @@ #include "Debug Control.h" #include "expat.h" #include "Loading Screen.h" -#include "Queen Command.h" #include "Enemy Soldier Save.h" #include "NPC.h" -#include "Strategic Event Handler.h" #include "MessageBoxScreen.h" -#include "interface Dialogue.h" #include "Map Screen Interface.h" #include "history.h" #include "Bullets.h" @@ -105,6 +92,7 @@ #include "GameInitOptionsScreen.h" #ifdef JA2UB +#include "interface Dialogue.h" #include "SaveLoadGame.h" #include "email.h" #include "Ja25 Strategic Ai.h" @@ -121,12 +109,9 @@ #include "connect.h" //hayden added alot ""'s to get around client spawing random/different placed AI #include "SaveLoadGame.h" -#include "Strategic Mines.h" #include "Strategic Mines LUA.h" #include "UndergroundInit.h" -#include "LuaInitNPCs.h" -#include "Luaglobal.h" #include "sgp_logger.h"