significantly cleaned up includes (by IoP)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6056 3b4a5df2-a311-0410-b5c6-a8a6f20db521

Strategic/AI Viewer.cpp

@@ -12,7 +12,6 @@
 	#include "vsurface.h"
 	#include "Button System.h"
 	#include "Font Control.h"
-	#include "Simple Render Utils.h"
 	#include "Editor Taskbar Utils.h"
 	#include "line.h"
 	#include "input.h"
@@ -26,7 +25,6 @@
 	#include "Game Clock.h"
 	#include "Campaign Types.h"
 	#include "Queen Command.h"
-	#include "Campaign Init.h"
 	#include "overhead.h"
 	#include "Strategic Movement.h"
 	#include "GameSettings.h"

Strategic/Assignments.cpp

@@ -26,7 +26,6 @@
 	#include "Map Screen Helicopter.h"
 	#include "PopUpBox.h"
 	#include "Vehicles.h"
-	#include "Strategic Merc Handler.h"
 	#include "Merc Contract.h"
 	#include "Map Screen Interface Map.h"
 	#include "Strategic Movement.h"

Strategic/Campaign Init.cpp

@@ -11,7 +11,6 @@
 	#include "Strategic Movement.h"
 	#include "Strategic Status.h"
 	#include "GameSettings.h"
-	#include "Creature Spreading.h"
 	#include "Strategic AI.h"
 	#include "XML.h"
 	#include "expat.h"

Strategic/Game Event Hook.cpp

@@ -26,7 +26,6 @@
 	#include "Map Screen Interface.h"
 	#include "Map Screen Helicopter.h"
 	#include "Scheduling.h"
-	#include "BobbyRGuns.h"
 	#include "Arms Dealer Init.h"
 	#include "Strategic town reputation.h"
 	#include "air raid.h"

Strategic/Game Init.cpp

@@ -10,8 +10,6 @@
 	#include "worlddef.h"
 	#include "Soldier Control.h"
 	#include "overhead.h"
-	#include "fade screen.h"
-	#include "gamescreen.h"
 	#include "email.h"
 	#include "Game Clock.h"
 	#include "soldier profile.h"
@@ -21,7 +19,6 @@
 	#include "finances.h"
 	#include "soldier create.h"
 	#include "Soldier Init List.h"
-	#include "music control.h"
 	#include "strategic.h"
 	#include "history.h"
 	#include "merc entering.h"
@@ -40,21 +37,17 @@
 	#include "Creature Spreading.h"
 	#include "Quests.h"
 	#include "Strategic AI.h"
-	#include "sound control.h"
 	#include "Laptopsave.h"
 	#include "AimMembers.h"
 	#include "dialogue control.h"
 	#include "npc.h"
-	#include "Init.h"
 	#include "GameSettings.h"
-	#include "opplist.h"
 	#include "interface dialogue.h"
 	#include "Map Screen Interface Border.h"
 	#include "Map Screen Helicopter.h"
 	#include "Vehicles.h"
 	#include "Map Screen Interface Map.h"
 	#include "PreBattle Interface.h"
-	#include "Arms Dealer Init.h"
 	#include "bobbyr.h"
 	#include "helpscreen.h"
 	#include "Air Raid.h"
@@ -78,7 +71,6 @@
 #ifdef JA2UB
 #include "Ja25 Strategic Ai.h"
 #include "Ja25_Tactical.h"
-#include "Arms Dealer Init.h"
 #endif
 
 #include "LuaInitNPCs.h"
@@ -1247,4 +1239,4 @@ void ReStartingGame()
 	else
 		gubCheatLevel = 0;
 
-}
+}

Strategic/Hourly Update.cpp

@@ -10,7 +10,6 @@
 	#include "Quests.h"
 	#include "Game Clock.h"
 	#include "Overhead.h"
-	#include "Boxing.h"
 	#include "jascreens.h"
 	#include "screenids.h"
 	#include "Items.h"

Strategic/Ja25 Strategic Ai.cpp

@@ -2,9 +2,6 @@
 
 #ifdef PRECOMPILEDHEADERS
 	#include "Strategic All.h"
-	#include "Loading Screen.h"
-	#include "Enemy Soldier Save.h"
-	#include "points.h"
 #else
 	#include "strategicmap.h"
 	#include "strategic.h"
@@ -19,9 +16,7 @@
 	#include "worlddef.h"
 	#include "Soldier Control.h"
 	#include "overhead.h"
-	#include "interface panels.h"
 	#include "isometric utils.h"
-	#include "Ambient Control.h"
 	#include "worlddef.h"
 	#include "worlddat.h"
 	#include "text.h"
@@ -32,82 +27,56 @@
 	#include "handle UI.h"
 	#include "faces.h"
 	#include "renderworld.h"
-	#include "gamescreen.h"
-	#include "game clock.h"
-	#include "Soldier Init List.h"
-	#include "strategic turns.h"
-	#include "merc entering.h"
 	#include "Map Information.h"
 	#include "Assignments.h"
 	#include "message.h"
-	#include "Font Control.h"
-	#include "environment.h"
 	#include "Game Events.h"
 	#include "quests.h"
 	#include "FileMan.h"
 	#include "animated progressbar.h"
-	#include "music control.h"
-	#include "fade screen.h"
 	#include "Strategic Movement.h"
 	#include "Campaign Types.h"
-	#include "sys globals.h"
 	#include "Exit Grids.h"
 	#include "Tactical Save.h"
-	#include "pathai.h"
 	#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"
 	#include "PreBattle Interface.h"
-	#include "Shade Table Util.h"
-	#include "Scheduling.h"
 	#include "gameloop.h"
 	#include "Random.h"
 	#include "ai.h"
-	#include "opplist.h"
 	#include "keys.h"
 	#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"
 	#include "gamesettings.h"
-	#include "dialogue control.h"
 	#include "Town Militia.h"
 	#include "sysutil.h"
-	#include "Sound Control.h"
-	#include "points.h"
-	#include "render dirty.h"
 	#include "Debug Control.h"
-	#include "expat.h"
-	#include "Loading Screen.h"
 	#include "Queen Command.h"
-	#include "Enemy Soldier Save.h"
-	#include "Boxing.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"
 	#include "physics.h"
-	#include "Explosion Control.h"
 	#include "Auto Resolve.h"
 	#include "cursors.h"
 #endif
 
 #ifdef JA2UB
-
+#include "Soldier Init List.h"
+#include "Dialogue Control.h"
+#include "Game Clock.h"
+#include "opplist.h"
 #include "Ja25Update.h"
 #include "Ja25_Tactical.h"
 #include "Ja25 Strategic Ai.h"
@@ -2937,4 +2906,4 @@ void AddJA25AIDataToSector( JA25_SECTOR_AI *pSectorAIInfo )
 */
 }
 
-#endif
+#endif

Strategic/LuaInitNPCs.cpp

@@ -1,5 +1,4 @@
 #include <iostream>
-#include <string>
 #include <sstream>
 
 #include "Lua Interpreter.h"
@@ -51,10 +50,10 @@
 #include "Ja25Update.h"
 #include "ub_config.h"
 #include "Ja25Update.h"
+#include "End Game.h"
 #endif
 
 #include "Intro.h"
-#include "End Game.h"
 #include "Queen Command.h"
 #include "gamescreen.h"
 #include "Arms Dealer Init.h"
@@ -68,7 +67,6 @@ extern "C" {
 
 #include "lua_state.h"
 #include "lua_function.h"
-#include <vfs/Core/vfs_string.h>
 
 #include "Encrypted File.h"
 //-------------------------- UB ------------------------------
@@ -12053,4 +12051,4 @@ BOOLEAN LoadLuaGlobalFromLoadGameFile( HWFILE hFile )
 
 	return( TRUE );
 }
-//--------------------------------------------------------------
+//--------------------------------------------------------------

Strategic/Luaglobal.cpp

@@ -1,41 +1,37 @@
 #include <iostream>
-#include <string>
 #include <sstream>
 
 
 #include "connect.h"
 #include "FileMan.h"
 #include "GameSettings.h"
-#include "Game Init.h"
 #include "interface Dialogue.h"
-#include "opplist.h"
 #include "Strategic All.h"
 #include "Luaglobal.h"
 #include "Boxing.h"
 #include "LuaInitNPCs.h"
-#include "Game Clock.h"
 #include "Overhead.h"
 #include "Music Control.h"
 
 #include "Intro.h"
-#include "End Game.h"
 #include "Queen Command.h"
 #include "gamescreen.h"
 #include "Map Screen Interface Map.h"
-#include "ub_config.h"
 
 #include "Creature Spreading.h"
 #include "World Items.h"
 #include "Map Screen Helicopter.h"
 #include "Campaign Types.h"
 
+#include "ub_config.h"
+#include "Ja25_Tactical.h"
+
 extern "C" {
 #include "lua.h"
 #include "lauxlib.h"
 #include "lualib.h"
 }
 
-#include "Ja25_Tactical.h"
 
 using namespace std;
 
@@ -376,4 +372,4 @@ void IniGlobalGameSetting(lua_State *L)
 	lua_pushboolean(L, MORRIS_INSTRUCTION_NOTE);
 	lua_setglobal(L, "itemMORRIS_INSTRUCTION_NOTE");
 #endif
-}
+}

Strategic/Map Screen Interface Bottom.cpp

@@ -8,7 +8,6 @@
 	#include "mousesystem.h"
 	#include "Button System.h"
 	#include "sgp.h"
-	#include "WCheck.h"
 	#include "Utilities.h"
 	#include "message.h"
 	#include "mapscreen.h"
@@ -16,7 +15,6 @@
 	#include "font control.h"
 	#include "Radar Screen.h"
 	#include "game clock.h"
-	#include "cursors.h"
 	#include "sysutil.h"
 	#include "Render Dirty.h"
 	#include "Map Screen Interface.h"
@@ -33,7 +31,6 @@
 	#include "Air Raid.h"
 	#include "Finances.h"
 	#include "LaptopSave.h"
-	#include "Sound Control.h"
 	#include "Interface Items.h"
 	#include "wordwrap.h"
 	#include "meanwhile.h"
@@ -47,7 +44,6 @@
 	#include "Assignments.h"
 	#include "Soldier macros.h"
 	#include "GameSettings.h"
-	#include "_Ja25EnglishText.h"
 	#include "SaveLoadScreen.h"
 	#include "Interface Control.h"
 	#include "Sys Globals.h"

Strategic/Map Screen Interface Map Inventory.cpp

@@ -21,7 +21,6 @@
 	#include "Tactical Save.h"
 	#include "Overhead.h"
 	#include "english.h"
-	#include "Multi Language Graphic Utils.h"
 	#include "GameSettings.h"
 	#include "Radar Screen.h"
 	#include "message.h"
@@ -5271,4 +5270,4 @@ void HandleSectorCooldownFunctions( INT16 sMapX, INT16 sMapY, INT8 sMapZ, WORLDI
 			}
 		}
 	}
-}
+}

Strategic/MapScreen Quotes.cpp

@@ -4,17 +4,14 @@
 	#include "Map Screen Interface.h"
 	#include "string.h"
 	#include "Map Screen Interface Map.h"
-	#include "Render Dirty.h"
 	#include "Font Control.h"
 	#include "Assignments.h"
 	#include "Soldier Control.h"
 	#include "Overhead.h"
 	#include "Squads.h"
-	#include "Sound Control.h"
 	#include "Soundman.h"
 	#include "Message.h"
 	#include "PopUpBox.h"
-	#include "Game Clock.h"
 	#include "Handle Items.h"
 	#include "Interface Items.h"
 	#include "Isometric Utils.h"
@@ -35,7 +32,6 @@
 	#include "Map Screen Helicopter.h"
 	#include "PreBattle Interface.h"
 	#include "WordWrap.h"
-	#include "interface control.h"
 	#include "GameSettings.h"
 	#include "Campaign Types.h"
 	#include "Map Screen Interface Map Inventory.h"
@@ -46,9 +42,7 @@
 	#include "Random.h"
 	#include "Cursor Control.h"
 	#include "renderworld.h"
-	#include "Game Init.h"
 	#include "Strategic Mines.h"
-	#include "finances.h"
 	#include "strategic.h"
 	#include "Air Raid.h"
 	#include "Queen Command.h"
@@ -483,4 +477,4 @@ BOOLEAN HasJerryAlreadySaidTheMapScreenIntroSequence()
 	}
 }
 
-#endif
+#endif

Strategic/Merc Contract.cpp

@@ -21,10 +21,8 @@
 	#include "strategicmap.h"
 	#include "Quests.h"
 	#include "worlddef.h"
-	#include "rotting corpses.h"
 	#include "Animation Control.h"
 	#include "Tactical Save.h"
-	#include "Strategic Merc Handler.h"
 	#include "Interface Control.h"
 	#include "gamescreen.h"
 	#include "jascreens.h"

Strategic/MilitiaSquads.cpp

@@ -14,7 +14,6 @@
 	#include "Map Screen Interface.h"
 	#include "Interface.h"
 	#include "Laptopsave.h"
-	#include "finances.h"
 	#include "Game Clock.h"
 	#include "Assignments.h"
 	#include "squads.h"

Strategic/PreBattle Interface.cpp

@@ -2210,4 +2210,4 @@ void HandlePreBattleInterfaceStates()
 	{
 		gfTransitionMapscreenToAutoResolve = FALSE;
 	}
-}
+}

Strategic/Quest Debug System.cpp

@@ -30,7 +30,6 @@
 	#include	"dialogue control.h"
 	//#include	"Soldier Control.h"
 	#include	"overhead.h"
-	#include	"AimMembers.h"
 	#include	"MessageBoxScreen.h"
 	#include	"Stdio.h"
 	#include	"english.h"

Strategic/Reinforcement.cpp

@@ -14,8 +14,6 @@
 	#include "Map Screen Interface.h"
 	#include "Interface.h"
 	#include "Laptopsave.h"
-	#include "finances.h"
-	#include "Game Clock.h"
 	#include "Assignments.h"
 	#include "squads.h"
 	#include "Soldier Create.h"

Strategic/Strategic Event Handler.cpp

@@ -19,19 +19,15 @@
 	#include "Strategic Town Loyalty.h"
 	#include "Soldier Init List.h"
 	#include "SaveLoadMap.h"
-	#include "Worldman.h"
 	#include "Soldier Create.h"
 	#include "Soldier Add.h"
-	#include "Opplist.h"
 	#include "Renderworld.h"
 	#include "Soldier Profile.h"
 	#include "email.h"
 	#include "strategic.h"
-	#include "structure wrap.h"
 	#include "GameSettings.h"
 	#include "history.h"
 #endif
-#include "BobbyRMailOrder.h"
 
 #include "Luaglobal.h"
 #include "connect.h"

Strategic/Strategic Pathing.cpp

@@ -2,7 +2,6 @@
 	#include "Strategic All.h"
 #else
 	#include <stdio.h>
-	#include <stdarg.h>
 	#include <time.h>
 	#include "types.h"
 	#include "worlddef.h"
@@ -10,8 +9,6 @@
 	#include "strategic.h"
 	#include "mapscreen.h"
 	#include "overhead.h"
-	#include "interface panels.h"
-	#include "worldman.h"
 	#include "strategicmap.h"
 	#include "Strategic Pathing.h"
 	#include "Map Screen Interface Border.h"

Strategic/Strategic Status.cpp

@@ -1,7 +1,6 @@
 #ifdef PRECOMPILEDHEADERS
 	#include "Strategic All.h"
 #else
-	#include <memory.h>
 	#include "Strategic Status.h"
 	#include "Inventory Choosing.h"
 	#include "FileMan.h"
@@ -10,8 +9,6 @@
 	#include "Strategic Mines.h"
 	#include "email.h"
 	#include "Game Clock.h"
-	#include "TopicIDs.h"
-	#include "TopicOps.h"
 	#include "Debug.h"
 	#include "GameSettings.h"
 	#include "history.h"

Strategic/Strategic Town Loyalty.cpp

@@ -28,7 +28,6 @@
 	#include "GameSettings.h"
 	#include "Text.h"
 	#include "MessageBoxScreen.h"
-	#include "Creature Spreading.h"
 	#include "Town Militia.h"
 	#include "history.h"
 	#include "meanwhile.h"

Strategic/Strategic Turns.cpp

@@ -4,14 +4,11 @@
 	#include "sgp.h"
 	#include "Game Clock.h"
 	#include "Font Control.h"
-	#include "render dirty.h"
 	#include "Timer Control.h"
 	#include "overhead.h"
-	#include "environment.h"
 	#include "Game Clock.h"
 	#include "message.h"
 	#include "worlddef.h"
-	#include "rotting corpses.h"
 	#include "soldier create.h"
 	#include "soldier add.h"
 	#include "strategic turns.h"

Strategic/UndergroundInit.cpp

@@ -3,7 +3,6 @@
 #include <sstream>
 
 #include "UndergroundInit.h"
-#include "Campaign Init.h"
 #include "FileMan.h"
 #include "GameSettings.h"
 #include "Game Clock.h"

Strategic/mapscreen.cpp

@@ -31,11 +31,9 @@
 	#include <tchar.h>
 	#include "cursors.h"
 	#include "Soldier Profile.h"
-	#include "Interface Cursors.h"
 	#include "Interface Panels.h"
 	#include "Interface Control.h"
 	#include "sys globals.h"
-	#include "environment.h"
 	#include "Radar Screen.h"
 	#include "Render Dirty.h"
 	#include "utilities.h"
@@ -82,7 +80,6 @@
 	#include "english.h"
 	#include "Fade Screen.h"
 	#include "Strategic Mines.h"
-	#include "GameVersion.h"
 	#include "SaveLoadScreen.h"
 	#include "Options Screen.h"
 	#include "Auto Resolve.h"
@@ -101,7 +98,6 @@
 	#include "cheats.h"
 	#include "Strategic Town Loyalty.h"
 	#include "GameSettings.h"
-	#include "_Ja25EnglishText.h"
 	#include "Militia Control.h"
 	#include "Tactical Save.h"
 	#include "Explosion Control.h"
@@ -117,7 +113,6 @@
 #endif
 
 #include "connect.h" //hayden
-#include "fresh_header.h"
 #include "InterfaceItemImages.h"
 
 #ifdef JA2UB

Strategic/strategic.cpp

@@ -8,7 +8,6 @@
 	#include "Assignments.h"
 	#include "Interface Control.h"
 	#include "Overhead.h"
-	#include "Music Control.h"
 	#include "Soldier Profile.h"
 	#include "Dialogue Control.h"
 	#include "personnel.h"

Strategic/strategicmap.cpp

@@ -92,7 +92,6 @@
 	#include "Loading Screen.h"
 	#include "Queen Command.h"
 	#include "Enemy Soldier Save.h"
-	#include "Boxing.h"
 	#include "NPC.h"
 	#include "Strategic Event Handler.h"
 	#include "MessageBoxScreen.h"