diff --git a/GameSettings.cpp b/GameSettings.cpp index 6656cfed..3a6bbb01 100644 --- a/GameSettings.cpp +++ b/GameSettings.cpp @@ -34,7 +34,6 @@ #include "Queen Command.h" #include "Game Clock.h" #include "Init.h" - #include "displaycover.h" #include "InterfaceItemImages.h" #endif diff --git a/HelpScreen.cpp b/HelpScreen.cpp index 50ff0dca..37cf88a1 100644 --- a/HelpScreen.cpp +++ b/HelpScreen.cpp @@ -5,7 +5,6 @@ #include "Line.h" #else #include "sgp.h" - #include "sys globals.h" #include "sysutil.h" #include "vobject_blitters.h" #include "wcheck.h" @@ -13,13 +12,11 @@ #include "font control.h" #include "cursor control.h" #include "render dirty.h" - #include "GameScreen.h" #include "Text.h" #include "Utilities.h" #include "WordWrap.h" #include "Font Control.h" #include "text.h" - #include "Multi Language Graphic Utils.h" #include "HelpScreen.h" #include "HelpScreenText.h" #include "Line.h" diff --git a/Init.cpp b/Init.cpp index 3d1aa354..d608f425 100644 --- a/Init.cpp +++ b/Init.cpp @@ -10,7 +10,6 @@ #include "sgp.h" #include "Gameloop.h" #include "Screens.h" - #include "Wcheck.h" #include "INIReader.h" #include "vobject_blitters.h" #include "renderworld.h" @@ -25,14 +24,12 @@ #include "Utilities.h" #include "Radar Screen.h" #include "Render Dirty.h" - #include "cursors.h" #include "Sound Control.h" #include "Event Pump.h" #include "lighting.h" #include "Cursor Control.h" #include "music control.h" #include "video.h" - #include "sys globals.h" #include "mapscreen.h" #include "interface items.h" #include "Maputility.h" @@ -82,9 +79,7 @@ #include "Civ Quotes.h" -#include "Sector Summary.h" #include "LuaInitNPCs.h" -#include "Encyclopedia_Data.h" #include "Encyclopedia.h" #include "AimArchives.h" diff --git a/Intro.cpp b/Intro.cpp index 11d33b37..d42eb959 100644 --- a/Intro.cpp +++ b/Intro.cpp @@ -4,21 +4,15 @@ #include "Cinematics.h" #else #include "sgp.h" - #include "sys globals.h" #include "sysutil.h" #include "vobject_blitters.h" - #include "wcheck.h" - #include "cursors.h" #include "font control.h" #include "cursor control.h" #include "render dirty.h" - #include "GameScreen.h" #include "Text.h" #include "Utilities.h" #include "WordWrap.h" - #include "Font Control.h" #include "text.h" - #include "Multi Language Graphic Utils.h" #include "Line.h" #include "Intro.h" #include "Cinematics.h" @@ -27,8 +21,6 @@ #include "Music Control.h" #include "LibraryDataBase.h" #include "english.h" - #include "Game Init.h" - #include "Soldier Profile.h" #include "soldier profile type.h" #include "MessageBoxScreen.h" #include "sgp_logger.h" diff --git a/Ja25Update.cpp b/Ja25Update.cpp index 94c676e2..6599a7e6 100644 --- a/Ja25Update.cpp +++ b/Ja25Update.cpp @@ -5,7 +5,6 @@ #include #include #include -#include "wcheck.h" #include "Render Fun.h" #include "stdlib.h" #include "debug.h" @@ -19,29 +18,18 @@ #include #include "pathai.h" #include "Random.h" -#include "worldman.h" #include "Isometric Utils.h" -#include "Render Dirty.h" #include "renderworld.h" -#include "sys globals.h" #include "video.h" -#include "points.h" -#include "Win util.h" -#include "Sound Control.h" #include "weapons.h" #include "vobject_blitters.h" #include "Handle UI.h" -#include "soldier ani.h" #include "Event pump.h" -#include "opplist.h" #include "ai.h" #include "interface.h" #include "lighting.h" #include "faces.h" #include "Soldier Profile.h" -#include "gap.h" -#include "interface panels.h" -#include "campaign.h" #include "soldier macros.h" #include "english.h" #include "Squads.h" @@ -50,7 +38,6 @@ #include "Networking.h" #include "NetworkEvent.h" #endif -#include "structure wrap.h" #include "items.h" #include "Soundman.h" #include "utilities.h" @@ -60,41 +47,24 @@ #include "Keys.h" #include "dialogue control.h" #include "soldier functions.h" -#include "rt time defines.h" #include "Exit Grids.h" -#include "gamescreen.h" #include "Quests.h" #include "message.h" -#include "NPC.h" #include "SkillCheck.h" -#include "handle doors.h" #include "interface dialogue.h" -#include "smokeeffects.h" #include "GameSettings.h" -#include "tile animation.h" #include "ShopKeeper Interface.h" -#include "Arms Dealer Init.h" #include "vehicles.h" -#include "rotting corpses.h" -#include "Interface Control.h" #include "strategicmap.h" #include "morale.h" -#include "meanwhile.h" #include "drugs and alcohol.h" #include "SkillCheck.h" -#include "boxing.h" -#include "overhead map.h" #include "Map Information.h" -#include "environment.h" -#include "Game Clock.h" -#include "Explosion Control.h" #include "Buildings.h" #include "Text.h" -#include "Strategic Merc Handler.h" #include "Campaign Types.h" #include "Strategic Status.h" #include "civ quotes.h" -#include "Strategic Pathing.h" #include "Debug Control.h" #endif @@ -128,4 +98,4 @@ typedef struct #endif -//****************************************************************************** \ No newline at end of file +//****************************************************************************** diff --git a/Laptop/AimLinks.cpp b/Laptop/AimLinks.cpp index c333d4e1..c6f79665 100644 --- a/Laptop/AimLinks.cpp +++ b/Laptop/AimLinks.cpp @@ -4,7 +4,6 @@ #include "laptop.h" #include "AimLinks.h" #include "aim.h" - #include "Utilities.h" #include "WCheck.h" #include "WordWrap.h" #include "Text.h" diff --git a/Laptop/AimSort.cpp b/Laptop/AimSort.cpp index 207c05b0..1431aed1 100644 --- a/Laptop/AimSort.cpp +++ b/Laptop/AimSort.cpp @@ -9,7 +9,6 @@ #include "WordWrap.h" #include "Soldier Profile.h" #include "stdlib.h" - #include "Game Clock.h" #include "Text.h" #include "Multi Language Graphic Utils.h" #include "english.h" diff --git a/Laptop/BobbyRAmmo.cpp b/Laptop/BobbyRAmmo.cpp index 338ad4b1..b761998c 100644 --- a/Laptop/BobbyRAmmo.cpp +++ b/Laptop/BobbyRAmmo.cpp @@ -8,8 +8,6 @@ #include "Utilities.h" #include "WCheck.h" #include "WordWrap.h" - #include "Cursors.h" - #include "interface items.h" #include "Encrypted File.h" #include "text.h" #endif diff --git a/Laptop/BobbyRArmour.cpp b/Laptop/BobbyRArmour.cpp index 61034b74..2ff07e2d 100644 --- a/Laptop/BobbyRArmour.cpp +++ b/Laptop/BobbyRArmour.cpp @@ -8,7 +8,6 @@ #include "Utilities.h" #include "WCheck.h" #include "WordWrap.h" - #include "Cursors.h" #include "Text.h" #endif diff --git a/Laptop/BobbyRGuns.cpp b/Laptop/BobbyRGuns.cpp index 6978ba00..2de56e09 100644 --- a/Laptop/BobbyRGuns.cpp +++ b/Laptop/BobbyRGuns.cpp @@ -14,7 +14,6 @@ #include "Store Inventory.h" #include "LaptopSave.h" #include "Finances.h" - #include "AimMembers.h" #include "Overhead.h" #include "Weapons.h" #include "GameSettings.h" @@ -4298,4 +4297,4 @@ void GetHelpTextForItemInLaptop( STR16 pzStr, UINT16 usItemNumber ) } break; } -} \ No newline at end of file +} diff --git a/Laptop/BobbyRMailOrder.cpp b/Laptop/BobbyRMailOrder.cpp index 19e7af71..a4e9689d 100644 --- a/Laptop/BobbyRMailOrder.cpp +++ b/Laptop/BobbyRMailOrder.cpp @@ -32,7 +32,6 @@ #include "connect.h" #include "GameSettings.h" #include -#include #include /* diff --git a/Laptop/BobbyRMisc.cpp b/Laptop/BobbyRMisc.cpp index f13ac083..47333715 100644 --- a/Laptop/BobbyRMisc.cpp +++ b/Laptop/BobbyRMisc.cpp @@ -8,7 +8,6 @@ #include "Utilities.h" #include "WCheck.h" #include "WordWrap.h" - #include "Cursors.h" #include "Text.h" #endif diff --git a/Laptop/BobbyRUsed.cpp b/Laptop/BobbyRUsed.cpp index e495b9d1..386962d0 100644 --- a/Laptop/BobbyRUsed.cpp +++ b/Laptop/BobbyRUsed.cpp @@ -8,9 +8,7 @@ #include "Utilities.h" #include "WCheck.h" #include "WordWrap.h" - #include "Cursors.h" #include "Text.h" - #include "LaptopSave.h" #endif UINT32 guiUsedBackground; diff --git a/Laptop/BriefingRoom.cpp b/Laptop/BriefingRoom.cpp index 49dc1149..10668714 100644 --- a/Laptop/BriefingRoom.cpp +++ b/Laptop/BriefingRoom.cpp @@ -11,8 +11,6 @@ #include "email.h" #include "Game Clock.h" #include "Text.h" - #include "LaptopSave.h" - #include "Multi Language Graphic Utils.h" #include "soldier profile type.h" #endif @@ -593,4 +591,4 @@ void ResetActivationBriefingRoomStringTextBox(void) uiCursorBriefingRoomPosition = StringPixLength( pPlayerBriefingRoomActivationString, FONT14ARIAL ) + IMP_PLAYER_ACTIVATION_STRING_X; DisplayPlayerActivationBriefingRoomString(); DisplayActivationBriefingRoomStringCursor(); -} \ No newline at end of file +} diff --git a/Laptop/BriefingRoomM.cpp b/Laptop/BriefingRoomM.cpp index 4bcaef4a..b57e1846 100644 --- a/Laptop/BriefingRoomM.cpp +++ b/Laptop/BriefingRoomM.cpp @@ -11,8 +11,6 @@ #include "email.h" #include "Game Clock.h" #include "Text.h" - #include "LaptopSave.h" - #include "Multi Language Graphic Utils.h" #include "soldier profile type.h" #endif @@ -662,4 +660,4 @@ void ResetActivationBriefingRoomEnterStringTextBox(void) uiCursorBriefingRoomEnterPosition = StringPixLength( pPlayerBriefingRoomEnterActivationString, FONT14ARIAL ) + IMP_PLAYER_ACTIVATION_STRING_X; DisplayPlayerActivationBriefingRoomEnterString(); DisplayActivationBriefingRoomEnterStringCursor(); -} \ No newline at end of file +} diff --git a/Laptop/Encyclopedia.cpp b/Laptop/Encyclopedia.cpp index ca920db1..5c62bb86 100644 --- a/Laptop/Encyclopedia.cpp +++ b/Laptop/Encyclopedia.cpp @@ -2,8 +2,6 @@ #include "Laptop All.h" #else #include "Laptop All.h" - #include "Utilities.h" - #include "WCheck.h" #include "timer control.h" #include "Debug.h" #include "WordWrap.h" @@ -11,8 +9,6 @@ #include "email.h" #include "Game Clock.h" #include "Text.h" - #include "LaptopSave.h" - #include "Multi Language Graphic Utils.h" #include "soldier profile type.h" #endif diff --git a/Laptop/Encyclopedia_Data.cpp b/Laptop/Encyclopedia_Data.cpp index 93e1b824..58e349ba 100644 --- a/Laptop/Encyclopedia_Data.cpp +++ b/Laptop/Encyclopedia_Data.cpp @@ -8,7 +8,6 @@ #include "WCheck.h" #include "WordWrap.h" #include "Text.h" - #include "Multi Language Graphic Utils.h" #include "Encrypted File.h" #include "Soldier Profile.h" #endif @@ -16,7 +15,6 @@ #include "Encyclopedia_Data.h" #include "Encyclopedia.h" #include "Quests.h" -#include "Tactical Save.h" #define MAX_FILTR_LOCATION_BUTTONS 11 #define FILTR_INVENTORY_BUTTONS 5 @@ -3131,4 +3129,4 @@ void BtnEncyclopediaTogglesCallback( GUI_BUTTON *btn, INT32 reason ) } } } -*/ \ No newline at end of file +*/ diff --git a/Laptop/IMP AboutUs.cpp b/Laptop/IMP AboutUs.cpp index 1048b5d1..37f03670 100644 --- a/Laptop/IMP AboutUs.cpp +++ b/Laptop/IMP AboutUs.cpp @@ -5,10 +5,8 @@ #include "CharProfile.h" #include "IMPVideoObjects.h" #include "Utilities.h" - #include "WCheck.h" #include "Debug.h" #include "WordWrap.h" - #include "Render Dirty.h" #include "Encrypted File.h" #include "cursors.h" #include "laptop.h" diff --git a/Laptop/IMP Attribute Entrance.cpp b/Laptop/IMP Attribute Entrance.cpp index 2a0ec1a2..50ccb47b 100644 --- a/Laptop/IMP Attribute Entrance.cpp +++ b/Laptop/IMP Attribute Entrance.cpp @@ -4,13 +4,10 @@ #include "CharProfile.h" #include "IMP Attribute Entrance.h" #include "IMP MainPage.h" - #include "IMP HomePage.h" #include "IMPVideoObjects.h" #include "Utilities.h" - #include "WCheck.h" #include "Debug.h" #include "WordWrap.h" - #include "Render Dirty.h" #include "Encrypted File.h" #include "cursors.h" #include "laptop.h" diff --git a/Laptop/IMP Attribute Finish.cpp b/Laptop/IMP Attribute Finish.cpp index ad208a0f..fa45e963 100644 --- a/Laptop/IMP Attribute Finish.cpp +++ b/Laptop/IMP Attribute Finish.cpp @@ -4,15 +4,12 @@ #include "CharProfile.h" #include "IMP Attribute Finish.h" #include "IMP MainPage.h" - #include "IMP HomePage.h" #include "IMPVideoObjects.h" #include "Utilities.h" - #include "WCheck.h" #include "input.h" #include "Isometric Utils.h" #include "Debug.h" #include "WordWrap.h" - #include "Render Dirty.h" #include "Encrypted File.h" #include "cursors.h" #include "laptop.h" diff --git a/Laptop/IMP Attribute Selection.cpp b/Laptop/IMP Attribute Selection.cpp index 012d354e..661ffe19 100644 --- a/Laptop/IMP Attribute Selection.cpp +++ b/Laptop/IMP Attribute Selection.cpp @@ -6,16 +6,13 @@ #include "CharProfile.h" #include "IMP Attribute Selection.h" #include "IMP MainPage.h" - #include "IMP HomePage.h" #include "IMPVideoObjects.h" #include "Utilities.h" - #include "WCheck.h" #include "input.h" #include "Isometric Utils.h" #include "IMP Skill Trait.h" #include "Debug.h" #include "WordWrap.h" - #include "Render Dirty.h" #include "Encrypted File.h" #include "cursors.h" #include "laptop.h" @@ -2238,4 +2235,4 @@ INT8 StartingLevelChosen() return(iStartingLevel); else return(1); -} \ No newline at end of file +} diff --git a/Laptop/IMP Begin Screen.cpp b/Laptop/IMP Begin Screen.cpp index 4545e128..4da8ce57 100644 --- a/Laptop/IMP Begin Screen.cpp +++ b/Laptop/IMP Begin Screen.cpp @@ -7,11 +7,9 @@ #include "IMP HomePage.h" #include "IMPVideoObjects.h" #include "Utilities.h" - #include "WCheck.h" #include "Timer Control.h" #include "Debug.h" #include "WordWrap.h" - #include "Render Dirty.h" #include "Encrypted File.h" #include "cursors.h" #include "laptop.h" @@ -21,18 +19,15 @@ #include "messageboxscreen.h" #include "Soldier Profile Type.h" #include "IMP Portraits.h" - #include "IMP Voices.h" #include "IMP Attribute Selection.h" #include "english.h" #include "line.h" #include "Merc Hiring.h" #include "strategic.h" - #include "Game Clock.h" #include "text.h" #include "LaptopSave.h" #endif -#include #define FULL_NAME_CURSOR_Y LAPTOP_SCREEN_WEB_UL_Y + 138 #define NICK_NAME_CURSOR_Y LAPTOP_SCREEN_WEB_UL_Y + 195 diff --git a/Laptop/IMP Character Trait.cpp b/Laptop/IMP Character Trait.cpp index 16b0e98c..342074b2 100644 --- a/Laptop/IMP Character Trait.cpp +++ b/Laptop/IMP Character Trait.cpp @@ -17,8 +17,6 @@ #include "_Ja25EnglishText.h" #include "wordwrap.h" #include "CharProfile.h" - #include "soldier profile type.h" - #include "IMP Compile Character.h" #include "GameSettings.h" #endif @@ -493,4 +491,4 @@ void AssignCharacterTraitHelpText( UINT8 ubNumber ) SetRegionHelpEndCallback( &gMR_CharacterTraitHelpTextRegions[ubNumber], MSYS_NO_CALLBACK ); return; -} \ No newline at end of file +} diff --git a/Laptop/IMP Character and Disability Entrance.cpp b/Laptop/IMP Character and Disability Entrance.cpp index d73a4698..9f758566 100644 --- a/Laptop/IMP Character and Disability Entrance.cpp +++ b/Laptop/IMP Character and Disability Entrance.cpp @@ -4,13 +4,10 @@ #include "CharProfile.h" #include "IMP Character and Disability Entrance.h" #include "IMP MainPage.h" - #include "IMP HomePage.h" #include "IMPVideoObjects.h" #include "Utilities.h" - #include "WCheck.h" #include "Debug.h" #include "WordWrap.h" - #include "Render Dirty.h" #include "Encrypted File.h" #include "cursors.h" #include "laptop.h" diff --git a/Laptop/IMP Color Choosing.cpp b/Laptop/IMP Color Choosing.cpp index 3994130e..fbc5c77b 100644 --- a/Laptop/IMP Color Choosing.cpp +++ b/Laptop/IMP Color Choosing.cpp @@ -14,13 +14,10 @@ #include "cursors.h" #include "IMP MainPage.h" #include "IMPVideoObjects.h" - #include "_Ja25EnglishText.h" #include "wordwrap.h" #include "CharProfile.h" #include "soldier profile type.h" - #include "IMP Compile Character.h" #include "IMP Portraits.h" - #include "IMP Begin Screen.h" #include "WCheck.h" #include "Animation Data.h" #include "GameSettings.h" @@ -1204,4 +1201,4 @@ void SetBadAss( BOOLEAN fSetTrue ) bBadAss = TRUE; else bBadAss = FALSE; -} \ No newline at end of file +} diff --git a/Laptop/IMP Compile Character.cpp b/Laptop/IMP Compile Character.cpp index 1ccaf429..6c097931 100644 --- a/Laptop/IMP Compile Character.cpp +++ b/Laptop/IMP Compile Character.cpp @@ -6,29 +6,17 @@ #include "laptop.h" #include "CharProfile.h" #include "Utilities.h" - #include "WCheck.h" #include "Debug.h" #include "WordWrap.h" - #include "Render Dirty.h" #include "Encrypted File.h" - #include "cursors.h" #include "GameSettings.h" - #include "IMP HomePage.h" #include "IMPVideoObjects.h" - #include "IMP AboutUs.h" #include "IMP MainPage.h" - #include "IMP Begin Screen.h" #include "IMP Personality Entrance.h" - #include "IMP Personality Quiz.h" - #include "IMP Personality Finish.h" #include "IMP Skill Trait.h" - #include "IMP Attribute Entrance.h" #include "IMP Attribute Selection.h" - #include "IMP Attribute Finish.h" #include "IMP Portraits.h" #include "IMP Compile Character.h" - #include "IMP Voices.h" - #include "IMP Finish.h" #include "Soldier Profile Type.h" #include "Soldier Profile.h" #include "Animation Data.h" diff --git a/Laptop/IMP Confirm.cpp b/Laptop/IMP Confirm.cpp index 571907be..60123383 100644 --- a/Laptop/IMP Confirm.cpp +++ b/Laptop/IMP Confirm.cpp @@ -6,10 +6,8 @@ #include "IMP HomePage.h" #include "IMPVideoObjects.h" #include "Utilities.h" - #include "WCheck.h" #include "Debug.h" #include "WordWrap.h" - #include "Render Dirty.h" #include "Encrypted File.h" #include "cursors.h" #include "laptop.h" @@ -22,7 +20,6 @@ #include "Soldier Profile Type.h" #include "Soldier Control.h" #include "IMP Portraits.h" - #include "IMP Voices.h" #include "Overhead.h" #include "finances.h" #include "history.h" @@ -34,7 +31,6 @@ #include "weapons.h" #include "Random.h" #include "GameVersion.h" - #include "faces.h" #include "GameSettings.h" #endif diff --git a/Laptop/IMP Disability Trait.cpp b/Laptop/IMP Disability Trait.cpp index 0ba68561..e4357964 100644 --- a/Laptop/IMP Disability Trait.cpp +++ b/Laptop/IMP Disability Trait.cpp @@ -17,8 +17,6 @@ #include "_Ja25EnglishText.h" #include "wordwrap.h" #include "CharProfile.h" - #include "soldier profile type.h" - #include "IMP Compile Character.h" #include "GameSettings.h" #endif @@ -505,4 +503,4 @@ void AssignDisabilityHelpText( UINT8 ubNumber ) SetRegionHelpEndCallback( &gMR_DisabilityHelpTextRegions[ubNumber], MSYS_NO_CALLBACK ); return; -} \ No newline at end of file +} diff --git a/Laptop/IMP Finish.cpp b/Laptop/IMP Finish.cpp index 5679c1f3..c0c4f04d 100644 --- a/Laptop/IMP Finish.cpp +++ b/Laptop/IMP Finish.cpp @@ -4,7 +4,6 @@ #include "CharProfile.h" #include "IMP Finish.h" #include "IMP Portraits.h" - #include "IMP HomePage.h" #include "IMP MainPage.h" #include "IMP Voices.h" #include "IMPVideoObjects.h" @@ -13,14 +12,12 @@ #include "Timer Control.h" #include "Debug.h" #include "WordWrap.h" - #include "Render Dirty.h" #include "Encrypted File.h" #include "cursors.h" #include "laptop.h" #include "IMP Attribute Selection.h" #include "IMP Text System.h" #include "soundman.h" - #include "IMP Compile Character.h" #include "text.h" #endif diff --git a/Laptop/IMP HomePage.cpp b/Laptop/IMP HomePage.cpp index 0db4b321..294e41a3 100644 --- a/Laptop/IMP HomePage.cpp +++ b/Laptop/IMP HomePage.cpp @@ -6,11 +6,9 @@ #include "IMP HomePage.h" #include "IMPVideoObjects.h" #include "Utilities.h" - #include "WCheck.h" #include "Debug.h" #include "WordWrap.h" #include "IMP Compile Character.h" - #include "Render Dirty.h" #include "Encrypted File.h" #include "cursors.h" #include "laptop.h" diff --git a/Laptop/IMP MainPage.cpp b/Laptop/IMP MainPage.cpp index 43ab67ad..d10ffa53 100644 --- a/Laptop/IMP MainPage.cpp +++ b/Laptop/IMP MainPage.cpp @@ -8,18 +8,15 @@ #include "WCheck.h" #include "Debug.h" #include "WordWrap.h" - #include "Render Dirty.h" #include "Encrypted File.h" #include "cursors.h" #include "laptop.h" - #include "finances.h" #include "IMP Attribute Selection.h" #include "IMP Text System.h" #include "IMP Finish.h" #include "mousesystem.h" #include "Merc Hiring.h" #include "LaptopSave.h" - #include "IMP Compile Character.h" #include "IMP Portraits.h" #include "soldier profile type.h" #include "GameSettings.h" diff --git a/Laptop/IMP Personality Entrance.cpp b/Laptop/IMP Personality Entrance.cpp index fa1be06f..9b8f5637 100644 --- a/Laptop/IMP Personality Entrance.cpp +++ b/Laptop/IMP Personality Entrance.cpp @@ -4,13 +4,10 @@ #include "CharProfile.h" #include "IMP Personality Entrance.h" #include "IMP MainPage.h" - #include "IMP HomePage.h" #include "IMPVideoObjects.h" #include "Utilities.h" - #include "WCheck.h" #include "Debug.h" #include "WordWrap.h" - #include "Render Dirty.h" #include "Encrypted File.h" #include "cursors.h" #include "laptop.h" diff --git a/Laptop/IMP Personality Finish.cpp b/Laptop/IMP Personality Finish.cpp index e9c936b9..3e620005 100644 --- a/Laptop/IMP Personality Finish.cpp +++ b/Laptop/IMP Personality Finish.cpp @@ -4,14 +4,10 @@ #include "CharProfile.h" #include "IMP Personality Finish.h" #include "IMP MainPage.h" - #include "IMP HomePage.h" #include "IMPVideoObjects.h" #include "Utilities.h" - #include "WCheck.h" - #include "Timer Control.h" #include "Debug.h" #include "WordWrap.h" - #include "Render Dirty.h" #include "Encrypted File.h" #include "cursors.h" #include "laptop.h" diff --git a/Laptop/IMP Personality Quiz.cpp b/Laptop/IMP Personality Quiz.cpp index 3a27cb5d..3ce0ac37 100644 --- a/Laptop/IMP Personality Quiz.cpp +++ b/Laptop/IMP Personality Quiz.cpp @@ -4,13 +4,10 @@ #include "CharProfile.h" #include "IMP Personality Quiz.h" #include "IMP MainPage.h" - #include "IMP HomePage.h" #include "IMPVideoObjects.h" #include "Utilities.h" - #include "WCheck.h" #include "Debug.h" #include "WordWrap.h" - #include "Render Dirty.h" #include "Encrypted File.h" #include "cursors.h" #include "laptop.h" diff --git a/Laptop/IMP Portraits.cpp b/Laptop/IMP Portraits.cpp index f8e3a3d2..6948685a 100644 --- a/Laptop/IMP Portraits.cpp +++ b/Laptop/IMP Portraits.cpp @@ -4,7 +4,6 @@ #include "CharProfile.h" #include "IMP Portraits.h" #include "IMP MainPage.h" - #include "IMP HomePage.h" #include "IMPVideoObjects.h" #include "Utilities.h" #include "WCheck.h" @@ -12,13 +11,10 @@ #include "Isometric Utils.h" #include "Debug.h" #include "WordWrap.h" - #include "Render Dirty.h" #include "Encrypted File.h" #include "cursors.h" #include "laptop.h" #include "IMP Text System.h" - #include "IMP Voices.h" - #include "IMP Compile Character.h" #endif #include "IMP Confirm.h" diff --git a/Laptop/IMP Text System.cpp b/Laptop/IMP Text System.cpp index 4eb01c61..217a295c 100644 --- a/Laptop/IMP Text System.cpp +++ b/Laptop/IMP Text System.cpp @@ -3,7 +3,6 @@ #else #include "WordWrap.h" #include "sgp.h" - #include "Render Dirty.h" #include "Encrypted File.h" #include "IMP Text System.h" #include "CharProfile.h" @@ -24,7 +23,6 @@ #include "WCheck.h" #include "Debug.h" #include "WordWrap.h" - #include "Render Dirty.h" #include "Encrypted File.h" #include "cursors.h" #include "soldier profile.h" diff --git a/Laptop/IMP Voices.cpp b/Laptop/IMP Voices.cpp index 1773589e..b7f7db18 100644 --- a/Laptop/IMP Voices.cpp +++ b/Laptop/IMP Voices.cpp @@ -4,15 +4,12 @@ #include "CharProfile.h" #include "IMP Voices.h" #include "IMP MainPage.h" - #include "IMP HomePage.h" #include "IMPVideoObjects.h" #include "Utilities.h" - #include "WCheck.h" #include "input.h" #include "Isometric Utils.h" #include "Debug.h" #include "WordWrap.h" - #include "Render Dirty.h" #include "Encrypted File.h" #include "cursors.h" #include "laptop.h" diff --git a/Laptop/IMPVideoObjects.cpp b/Laptop/IMPVideoObjects.cpp index ce730b07..1d7084ac 100644 --- a/Laptop/IMPVideoObjects.cpp +++ b/Laptop/IMPVideoObjects.cpp @@ -6,10 +6,7 @@ #include "WCheck.h" #include "Debug.h" #include "WordWrap.h" - #include "Render Dirty.h" #include "Encrypted File.h" - #include "cursors.h" - #include "IMP HomePage.h" #include "laptop.h" #include "Multi Language Graphic Utils.h" #include "IMP Attribute Selection.h" diff --git a/Laptop/XML_Email.cpp b/Laptop/XML_Email.cpp index ea915e20..2ef7e1fc 100644 --- a/Laptop/XML_Email.cpp +++ b/Laptop/XML_Email.cpp @@ -8,7 +8,6 @@ #include "expat.h" #include "XML.h" #include "Interface.h" - #include "Item Statistics.h" #include "LuaInitNPCs.h" #include "email.h" #endif diff --git a/Laptop/XML_EmailMercAvailable.cpp b/Laptop/XML_EmailMercAvailable.cpp index 14d0f13f..22b61f35 100644 --- a/Laptop/XML_EmailMercAvailable.cpp +++ b/Laptop/XML_EmailMercAvailable.cpp @@ -8,7 +8,6 @@ #include "expat.h" #include "XML.h" #include "Interface.h" - #include "Item Statistics.h" #include "LuaInitNPCs.h" #include "email.h" #endif diff --git a/Laptop/XML_EmailMercLevelUp.cpp b/Laptop/XML_EmailMercLevelUp.cpp index 7ec4c5d3..18a66cf0 100644 --- a/Laptop/XML_EmailMercLevelUp.cpp +++ b/Laptop/XML_EmailMercLevelUp.cpp @@ -8,7 +8,6 @@ #include "expat.h" #include "XML.h" #include "Interface.h" - #include "Item Statistics.h" #include "LuaInitNPCs.h" #include "email.h" #endif diff --git a/Laptop/XML_EncyclopediaLocation.cpp b/Laptop/XML_EncyclopediaLocation.cpp index 6cbad176..7af2d969 100644 --- a/Laptop/XML_EncyclopediaLocation.cpp +++ b/Laptop/XML_EncyclopediaLocation.cpp @@ -8,7 +8,6 @@ #include "expat.h" #include "XML.h" #include "Interface.h" - #include "Item Statistics.h" #include "LuaInitNPCs.h" #include "email.h" #include "InterfaceItemImages.h" diff --git a/Laptop/XML_IMPPortraits.cpp b/Laptop/XML_IMPPortraits.cpp index a6b43fb1..9563a5b3 100644 --- a/Laptop/XML_IMPPortraits.cpp +++ b/Laptop/XML_IMPPortraits.cpp @@ -7,7 +7,6 @@ #include "XML.h" #include "Interface.h" #include "IMP Confirm.h" - #include "IMP Portraits.h" #include "Soldier Profile.h" #endif diff --git a/Laptop/email.cpp b/Laptop/email.cpp index 2e2f67e1..fc5ba41f 100644 --- a/Laptop/email.cpp +++ b/Laptop/email.cpp @@ -7,16 +7,13 @@ #include "WCheck.h" #include "Debug.h" #include "WordWrap.h" - #include "Render Dirty.h" #include "Encrypted File.h" #include "cursors.h" #include "soldier profile.h" #include "CharProfile.h" #include "IMP Compile Character.h" - #include "IMP Voices.h" #include "IMP Portraits.h" #include "Game Clock.h" - #include "environment.h" #include "AimMembers.h" #include "Random.h" #include "Text.h" diff --git a/Laptop/files.cpp b/Laptop/files.cpp index 4dc15dff..2114b01f 100644 --- a/Laptop/files.cpp +++ b/Laptop/files.cpp @@ -10,7 +10,6 @@ #include "WCheck.h" #include "Debug.h" #include "WordWrap.h" - #include "Render Dirty.h" #include "Encrypted File.h" #include "cursors.h" #include "email.h" diff --git a/Laptop/finances.cpp b/Laptop/finances.cpp index 240b2254..ea30283f 100644 --- a/Laptop/finances.cpp +++ b/Laptop/finances.cpp @@ -8,7 +8,6 @@ #include "WCheck.h" #include "Debug.h" #include "WordWrap.h" - #include "Render Dirty.h" #include "Encrypted File.h" #include "cursors.h" #include "Soldier Profile.h" diff --git a/Laptop/florist Cards.cpp b/Laptop/florist Cards.cpp index 18a03edb..5a37b718 100644 --- a/Laptop/florist Cards.cpp +++ b/Laptop/florist Cards.cpp @@ -9,7 +9,6 @@ #include "WordWrap.h" #include "Cursors.h" #include "Encrypted File.h" - #include "Florist Gallery.h" #include "Text.h" #endif diff --git a/Laptop/history.cpp b/Laptop/history.cpp index 8933784f..f3803a31 100644 --- a/Laptop/history.cpp +++ b/Laptop/history.cpp @@ -8,7 +8,6 @@ #include "WCheck.h" #include "Debug.h" #include "WordWrap.h" - #include "Render Dirty.h" #include "Encrypted File.h" #include "cursors.h" #include "Soldier Profile.h" diff --git a/Laptop/personnel.cpp b/Laptop/personnel.cpp index b0fc4703..00e99676 100644 --- a/Laptop/personnel.cpp +++ b/Laptop/personnel.cpp @@ -7,7 +7,6 @@ #include "WCheck.h" #include "Debug.h" #include "WordWrap.h" - #include "Render Dirty.h" #include "Encrypted File.h" #include "cursors.h" #include "Overhead.h" @@ -17,7 +16,6 @@ #include "Game Clock.h" #include "finances.h" #include "LaptopSave.h" - #include "AimMembers.h" #include "Map Screen Interface Map.h" #include "input.h" #include "english.h" diff --git a/MPChatScreen.cpp b/MPChatScreen.cpp index 62eca5f1..f9ff8e9b 100644 --- a/MPChatScreen.cpp +++ b/MPChatScreen.cpp @@ -4,21 +4,17 @@ #include "sgp.h" #include "screenids.h" #include "Timer Control.h" - #include "sys globals.h" #include "fade screen.h" #include "sysutil.h" #include "vobject_blitters.h" #include "MercTextBox.h" - #include "wcheck.h" #include "cursors.h" #include "font control.h" - #include "Game Clock.h" #include "Map Screen Interface.h" #include "renderworld.h" #include "gameloop.h" #include "english.h" #include "GameSettings.h" - #include "Interface Control.h" #include "cursor control.h" #include "laptop.h" #include "text.h" @@ -26,7 +22,6 @@ #include "overhead map.h" #include "MPChatScreen.h" #include "WordWrap.h" - #include "Render Dirty.h" #include "message.h" #include "utilities.h" #include "connect.h" @@ -1611,4 +1606,4 @@ void ClearWrappedStringsCHAT( WRAPPED_STRING *pStringWrapperHead ) pStringWrapperHead = NULL; -} \ No newline at end of file +} diff --git a/MPConnectScreen.cpp b/MPConnectScreen.cpp index 1b2ca83a..100e2230 100644 --- a/MPConnectScreen.cpp +++ b/MPConnectScreen.cpp @@ -1,6 +1,5 @@ #ifdef PRECOMPILEDHEADERS #include "JA2 All.h" - #include "Intro.h" #else #include "Types.h" #include "MPConnectScreen.h" @@ -18,12 +17,9 @@ #include "Cursor Control.h" #include "Music Control.h" #include "cursors.h" - #include "Intro.h" #include "Text.h" #include "Text Input.h" - #include "_Ja25EnglishText.h" #include "Soldier Profile.h" - #include "Loading Screen.h" #include "Animated ProgressBar.h" #include "mainmenuscreen.h" #endif @@ -32,7 +28,6 @@ #include "Game Init.h" #include "connect.h" #include "network.h" // for client name -#include "saveloadscreen.h" #include "message.h" #include "init.h" #include "xml.h" diff --git a/MPHostScreen.cpp b/MPHostScreen.cpp index 17de7c7c..19b60f01 100644 --- a/MPHostScreen.cpp +++ b/MPHostScreen.cpp @@ -16,7 +16,6 @@ #include "Sysutil.h" #include "Fade Screen.h" #include "Cursor Control.h" - #include "Music Control.h" #include "cursors.h" #include "Intro.h" #include "Text.h" @@ -2864,4 +2863,4 @@ void RenderMPHSmallSelectionFrame(INT16 sX, INT16 sY) BltVideoObject(FRAME_BUFFER, hHandle, 0, sX, sY , VO_BLT_SRCTRANSPARENCY,NULL); return; -} \ No newline at end of file +} diff --git a/MPJoinScreen.cpp b/MPJoinScreen.cpp index 9b2b6112..c3e100a2 100644 --- a/MPJoinScreen.cpp +++ b/MPJoinScreen.cpp @@ -1,6 +1,5 @@ #ifdef PRECOMPILEDHEADERS #include "JA2 All.h" - #include "Intro.h" #else #include "Types.h" #include "MPJoinScreen.h" @@ -16,12 +15,9 @@ #include "Sysutil.h" #include "Fade Screen.h" #include "Cursor Control.h" - #include "Music Control.h" #include "cursors.h" - #include "Intro.h" #include "Text.h" #include "Text Input.h" - #include "_Ja25EnglishText.h" #include "Soldier Profile.h" #endif @@ -799,4 +795,4 @@ void DoneFadeOutForExitMPJScreen( void ) void DoneFadeInForExitMPJScreen( void ) { SetCurrentCursorFromDatabase( VIDEO_NO_CURSOR ); -} \ No newline at end of file +} diff --git a/MPScoreScreen.cpp b/MPScoreScreen.cpp index b3c64214..272b98cb 100644 --- a/MPScoreScreen.cpp +++ b/MPScoreScreen.cpp @@ -21,7 +21,6 @@ #include "Intro.h" #include "Text.h" #include "Text Input.h" - #include "_Ja25EnglishText.h" #include "Soldier Profile.h" #endif @@ -29,7 +28,6 @@ #include "Game Init.h" #include "connect.h" #include "network.h" // for client name -#include "saveloadscreen.h" //////////////////////////////////////////// @@ -657,4 +655,4 @@ void BtnMPSContinueCallback(GUI_BUTTON *btn,INT32 reason) InvalidateRegion(btn->Area.RegionTopLeftX, btn->Area.RegionTopLeftY, btn->Area.RegionBottomRightX, btn->Area.RegionBottomRightY); } -} \ No newline at end of file +} diff --git a/MainMenuScreen.cpp b/MainMenuScreen.cpp index a01570c5..183596d5 100644 --- a/MainMenuScreen.cpp +++ b/MainMenuScreen.cpp @@ -5,12 +5,9 @@ #include "sgp.h" #include "screenids.h" #include "Timer Control.h" - #include "sys globals.h" - #include "fade screen.h" #include "sysutil.h" #include "vobject_blitters.h" #include "MercTextBox.h" - #include "wcheck.h" #include "cursors.h" #include "font control.h" #include "mainmenuscreen.h" @@ -18,7 +15,6 @@ #include "render dirty.h" #include "music control.h" #include "GameSettings.h" - #include "GameScreen.h" #include "SaveLoadScreen.h" #include "SaveLoadGame.h" #include "Options Screen.h" @@ -32,10 +28,8 @@ #include "Multi Language Graphic Utils.h" #include "Encrypted File.h" #include "ja2 splash.h" - #include "GameVersion.h" #endif -#include "mercs.h" #include "gamesettings.h" #include "connect.h" #include "strategic.h" diff --git a/MessageBoxScreen.cpp b/MessageBoxScreen.cpp index 680b9249..79fdd803 100644 --- a/MessageBoxScreen.cpp +++ b/MessageBoxScreen.cpp @@ -3,17 +3,13 @@ #else #include "sgp.h" #include "screenids.h" - #include "Timer Control.h" - #include "sys globals.h" #include "fade screen.h" #include "sysutil.h" #include "vobject_blitters.h" #include "MercTextBox.h" - #include "wcheck.h" #include "cursors.h" #include "messageboxscreen.h" #include "font control.h" - #include "Game Clock.h" #include "Map Screen Interface.h" #include "renderworld.h" #include "gameloop.h" diff --git a/SaveLoadGame.cpp b/SaveLoadGame.cpp index 82427c63..1cb80b71 100644 --- a/SaveLoadGame.cpp +++ b/SaveLoadGame.cpp @@ -48,7 +48,6 @@ #include "GameVersion.h" #include "GameSettings.h" #include "Music Control.h" - #include "GameScreen.h" #include "Options Screen.h" #include "Ai.h" #include "RenderWorld.h" @@ -138,7 +137,6 @@ #include //rain -#include "Rain.h" //end rain #include "connect.h" diff --git a/SaveLoadScreen.cpp b/SaveLoadScreen.cpp index 1f06c5ae..f23352ee 100644 --- a/SaveLoadScreen.cpp +++ b/SaveLoadScreen.cpp @@ -30,7 +30,6 @@ #include "English.h" #include "Gameloop.h" #include "Game Init.h" - #include "Sys Globals.h" #include "Text.h" #include "Message.h" #include "Map Screen Interface.h" @@ -39,7 +38,6 @@ #include "PostalService.h" #endif -#include "Campaign Init.h" #include "connect.h" #ifdef JA2UB @@ -2923,4 +2921,4 @@ BOOLEAN LoadDataSaveFromLoadGameFile( HWFILE hFile ) } return( TRUE ); -} \ No newline at end of file +} diff --git a/Standard Gaming Platform/Cursor Control.cpp b/Standard Gaming Platform/Cursor Control.cpp index 70337985..fc9bd1ec 100644 --- a/Standard Gaming Platform/Cursor Control.cpp +++ b/Standard Gaming Platform/Cursor Control.cpp @@ -11,7 +11,6 @@ #include "video2.h" #endif - #include "wcheck.h" #endif /////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/Standard Gaming Platform/DEBUG.cpp b/Standard Gaming Platform/DEBUG.cpp index 515cba7f..c7aa80dd 100644 --- a/Standard Gaming Platform/DEBUG.cpp +++ b/Standard Gaming Platform/DEBUG.cpp @@ -25,14 +25,10 @@ #include "types.h" #include - #include #include #include #include #include "debug.h" - #include "WCheck.h" - #include "TopicIDs.h" - #include "TopicOps.h" #include "WizShare.h" //Kris addition diff --git a/Standard Gaming Platform/DirectDraw Calls.cpp b/Standard Gaming Platform/DirectDraw Calls.cpp index d315a284..215db823 100644 --- a/Standard Gaming Platform/DirectDraw Calls.cpp +++ b/Standard Gaming Platform/DirectDraw Calls.cpp @@ -8,7 +8,6 @@ #include #include "debug.h" - #include "video_private.h" #include "vobject_blitters.h" #endif diff --git a/Standard Gaming Platform/ExceptionHandling.cpp b/Standard Gaming Platform/ExceptionHandling.cpp index 1a584bcb..495d0e9a 100644 --- a/Standard Gaming Platform/ExceptionHandling.cpp +++ b/Standard Gaming Platform/ExceptionHandling.cpp @@ -10,14 +10,9 @@ #include "FileMan.h" #endif -#include "ExceptionHandling.h" -#include -#include -#include #ifdef JA2 - #include "GameVersion.h" #endif //If we are to use exception handling @@ -1602,4 +1597,4 @@ void ERLogModules(HWFILE fdump) #endif } -#endif \ No newline at end of file +#endif diff --git a/Standard Gaming Platform/Install.cpp b/Standard Gaming Platform/Install.cpp index b48cff3c..cb20d068 100644 --- a/Standard Gaming Platform/Install.cpp +++ b/Standard Gaming Platform/Install.cpp @@ -23,8 +23,6 @@ #else #include "types.h" #include - #include - #include #include "Install.h" #include "RegInst.h" #endif diff --git a/Standard Gaming Platform/MemMan.cpp b/Standard Gaming Platform/MemMan.cpp index 178556ab..97e9bc51 100644 --- a/Standard Gaming Platform/MemMan.cpp +++ b/Standard Gaming Platform/MemMan.cpp @@ -49,7 +49,6 @@ //************************************************************************** #ifdef JA2 -#include "mousesystem.h" #include "MessageBoxScreen.h" STR16 gzJA2ScreenNames[] = { diff --git a/Standard Gaming Platform/PCX.cpp b/Standard Gaming Platform/PCX.cpp index ced980b0..b2314997 100644 --- a/Standard Gaming Platform/PCX.cpp +++ b/Standard Gaming Platform/PCX.cpp @@ -4,7 +4,6 @@ #include "WIZ8 SGP ALL.H" #else #include - #include #include "pcx.h" #include "memman.h" #include "fileman.h" diff --git a/Standard Gaming Platform/Random.cpp b/Standard Gaming Platform/Random.cpp index d36a65a3..99295a1b 100644 --- a/Standard Gaming Platform/Random.cpp +++ b/Standard Gaming Platform/Random.cpp @@ -1,5 +1,4 @@ #include "Random.h" -#include #include "debug control.h" extern bool is_client; @@ -93,4 +92,4 @@ void InitializeRandom() guiPreRandomIndex = 0; } -#endif \ No newline at end of file +#endif diff --git a/Standard Gaming Platform/debug_win_util.cpp b/Standard Gaming Platform/debug_win_util.cpp index 7e413a59..6da53bc9 100644 --- a/Standard Gaming Platform/debug_win_util.cpp +++ b/Standard Gaming Platform/debug_win_util.cpp @@ -12,7 +12,6 @@ #include -#include #include diff --git a/Standard Gaming Platform/input.cpp b/Standard Gaming Platform/input.cpp index 9fdf2c89..f4d2c41d 100644 --- a/Standard Gaming Platform/input.cpp +++ b/Standard Gaming Platform/input.cpp @@ -29,7 +29,6 @@ #include "local.h" #endif -#include "zmouse.h" // Make sure to refer to the translation table which is within one of the following files (depending // on the language used). ENGLISH.C, JAPANESE.C, FRENCH.C, GERMAN.C, SPANISH.C, etc... diff --git a/Standard Gaming Platform/sgp.cpp b/Standard Gaming Platform/sgp.cpp index d1465450..2fb5d523 100644 --- a/Standard Gaming Platform/sgp.cpp +++ b/Standard Gaming Platform/sgp.cpp @@ -9,7 +9,6 @@ #else #include "types.h" #include - #include #include #include #include @@ -58,9 +57,7 @@ #include #include -#include "ExceptionHandling.h" -#include "dbt.h" #include "INIReader.h" #include "Console.h" #include "Lua Interpreter.h" diff --git a/Standard Gaming Platform/shading.cpp b/Standard Gaming Platform/shading.cpp index c7e54331..dc505f4d 100644 --- a/Standard Gaming Platform/shading.cpp +++ b/Standard Gaming Platform/shading.cpp @@ -13,9 +13,6 @@ #endif #include "himage.h" #include "vobject.h" - #include "vobject_private.h" - #include "video_private.h" - #include "wcheck.h" #include "vobject_blitters.h" #include "shading.h" #endif diff --git a/Standard Gaming Platform/video.cpp b/Standard Gaming Platform/video.cpp index e0084ce9..5b1d6e3a 100644 --- a/Standard Gaming Platform/video.cpp +++ b/Standard Gaming Platform/video.cpp @@ -11,7 +11,6 @@ #include #include "renderworld.h" #include "Render Dirty.h" -#include "Isometric utils.h" #include "fade screen.h" #include "impTGA.h" #include "timer control.h" diff --git a/Standard Gaming Platform/vobject.cpp b/Standard Gaming Platform/vobject.cpp index dd4c8e49..cd870338 100644 --- a/Standard Gaming Platform/vobject.cpp +++ b/Standard Gaming Platform/vobject.cpp @@ -13,8 +13,6 @@ #endif #include "himage.h" #include "vobject.h" - #include "vobject_private.h" - #include "video_private.h" #include "wcheck.h" #include "vobject_blitters.h" #include "sgp.h" diff --git a/Standard Gaming Platform/vobject_blitters.cpp b/Standard Gaming Platform/vobject_blitters.cpp index ffa1d868..23ea2674 100644 --- a/Standard Gaming Platform/vobject_blitters.cpp +++ b/Standard Gaming Platform/vobject_blitters.cpp @@ -13,8 +13,6 @@ #endif #include "himage.h" #include "vobject.h" - #include "vobject_private.h" - #include "video_private.h" #include "wcheck.h" #include "vobject.h" #include "vobject_blitters.h" diff --git a/Standard Gaming Platform/vsurface.cpp b/Standard Gaming Platform/vsurface.cpp index 257e5bc1..c9830894 100644 --- a/Standard Gaming Platform/vsurface.cpp +++ b/Standard Gaming Platform/vsurface.cpp @@ -15,7 +15,6 @@ #include "himage.h" #include "vsurface.h" #include "vsurface_private.h" -#include "video_private.h" #include "wcheck.h" #include "vobject_blitters.h" #endif diff --git a/Strategic/AI Viewer.cpp b/Strategic/AI Viewer.cpp index c10fc075..18ce81bb 100644 --- a/Strategic/AI Viewer.cpp +++ b/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" diff --git a/Strategic/Assignments.cpp b/Strategic/Assignments.cpp index d1c72177..3bb69666 100644 --- a/Strategic/Assignments.cpp +++ b/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" diff --git a/Strategic/Campaign Init.cpp b/Strategic/Campaign Init.cpp index aeaffb91..88a61f93 100644 --- a/Strategic/Campaign Init.cpp +++ b/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" diff --git a/Strategic/Game Event Hook.cpp b/Strategic/Game Event Hook.cpp index 88909d8c..f9866167 100644 --- a/Strategic/Game Event Hook.cpp +++ b/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" diff --git a/Strategic/Game Init.cpp b/Strategic/Game Init.cpp index 17d98175..1717613b 100644 --- a/Strategic/Game Init.cpp +++ b/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; -} \ No newline at end of file +} diff --git a/Strategic/Hourly Update.cpp b/Strategic/Hourly Update.cpp index 1b0d516a..3766c274 100644 --- a/Strategic/Hourly Update.cpp +++ b/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" diff --git a/Strategic/Ja25 Strategic Ai.cpp b/Strategic/Ja25 Strategic Ai.cpp index a107eb05..0aa0a9ce 100644 --- a/Strategic/Ja25 Strategic Ai.cpp +++ b/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 \ No newline at end of file +#endif diff --git a/Strategic/LuaInitNPCs.cpp b/Strategic/LuaInitNPCs.cpp index 7718f2a2..c9a84290 100644 --- a/Strategic/LuaInitNPCs.cpp +++ b/Strategic/LuaInitNPCs.cpp @@ -1,5 +1,4 @@ #include -#include #include #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 #include "Encrypted File.h" //-------------------------- UB ------------------------------ @@ -12053,4 +12051,4 @@ BOOLEAN LoadLuaGlobalFromLoadGameFile( HWFILE hFile ) return( TRUE ); } -//-------------------------------------------------------------- \ No newline at end of file +//-------------------------------------------------------------- diff --git a/Strategic/Luaglobal.cpp b/Strategic/Luaglobal.cpp index 36faad62..30eaae63 100644 --- a/Strategic/Luaglobal.cpp +++ b/Strategic/Luaglobal.cpp @@ -1,41 +1,37 @@ #include -#include #include #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 -} \ No newline at end of file +} diff --git a/Strategic/Map Screen Interface Bottom.cpp b/Strategic/Map Screen Interface Bottom.cpp index bab7c74e..845891a8 100644 --- a/Strategic/Map Screen Interface Bottom.cpp +++ b/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" diff --git a/Strategic/Map Screen Interface Map Inventory.cpp b/Strategic/Map Screen Interface Map Inventory.cpp index 11bcfb35..d02db56e 100644 --- a/Strategic/Map Screen Interface Map Inventory.cpp +++ b/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 } } } -} \ No newline at end of file +} diff --git a/Strategic/MapScreen Quotes.cpp b/Strategic/MapScreen Quotes.cpp index 36f68871..c619cb30 100644 --- a/Strategic/MapScreen Quotes.cpp +++ b/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 \ No newline at end of file +#endif diff --git a/Strategic/Merc Contract.cpp b/Strategic/Merc Contract.cpp index 33d79fac..b2c272f2 100644 --- a/Strategic/Merc Contract.cpp +++ b/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" diff --git a/Strategic/MilitiaSquads.cpp b/Strategic/MilitiaSquads.cpp index 452aa7b6..269c1636 100644 --- a/Strategic/MilitiaSquads.cpp +++ b/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" diff --git a/Strategic/PreBattle Interface.cpp b/Strategic/PreBattle Interface.cpp index 34b74f39..5ab72ed1 100644 --- a/Strategic/PreBattle Interface.cpp +++ b/Strategic/PreBattle Interface.cpp @@ -2210,4 +2210,4 @@ void HandlePreBattleInterfaceStates() { gfTransitionMapscreenToAutoResolve = FALSE; } -} \ No newline at end of file +} diff --git a/Strategic/Quest Debug System.cpp b/Strategic/Quest Debug System.cpp index ec2ae91a..9e621dd2 100644 --- a/Strategic/Quest Debug System.cpp +++ b/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" diff --git a/Strategic/Reinforcement.cpp b/Strategic/Reinforcement.cpp index 26c9f0ad..b9a46b56 100644 --- a/Strategic/Reinforcement.cpp +++ b/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" diff --git a/Strategic/Strategic Event Handler.cpp b/Strategic/Strategic Event Handler.cpp index bba56736..d27e8953 100644 --- a/Strategic/Strategic Event Handler.cpp +++ b/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" diff --git a/Strategic/Strategic Pathing.cpp b/Strategic/Strategic Pathing.cpp index 9434f8c4..c5040c12 100644 --- a/Strategic/Strategic Pathing.cpp +++ b/Strategic/Strategic Pathing.cpp @@ -2,7 +2,6 @@ #include "Strategic All.h" #else #include - #include #include #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" diff --git a/Strategic/Strategic Status.cpp b/Strategic/Strategic Status.cpp index 76e69855..a265069b 100644 --- a/Strategic/Strategic Status.cpp +++ b/Strategic/Strategic Status.cpp @@ -1,7 +1,6 @@ #ifdef PRECOMPILEDHEADERS #include "Strategic All.h" #else - #include #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" diff --git a/Strategic/Strategic Town Loyalty.cpp b/Strategic/Strategic Town Loyalty.cpp index 26b25077..6e504d3d 100644 --- a/Strategic/Strategic Town Loyalty.cpp +++ b/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" diff --git a/Strategic/Strategic Turns.cpp b/Strategic/Strategic Turns.cpp index 7943312b..a05614ef 100644 --- a/Strategic/Strategic Turns.cpp +++ b/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" diff --git a/Strategic/UndergroundInit.cpp b/Strategic/UndergroundInit.cpp index dcbfec9d..85cc53c1 100644 --- a/Strategic/UndergroundInit.cpp +++ b/Strategic/UndergroundInit.cpp @@ -3,7 +3,6 @@ #include #include "UndergroundInit.h" -#include "Campaign Init.h" #include "FileMan.h" #include "GameSettings.h" #include "Game Clock.h" diff --git a/Strategic/mapscreen.cpp b/Strategic/mapscreen.cpp index 45492f04..7c81809d 100644 --- a/Strategic/mapscreen.cpp +++ b/Strategic/mapscreen.cpp @@ -31,11 +31,9 @@ #include #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 diff --git a/Strategic/strategic.cpp b/Strategic/strategic.cpp index 8859c7dd..859289af 100644 --- a/Strategic/strategic.cpp +++ b/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" diff --git a/Strategic/strategicmap.cpp b/Strategic/strategicmap.cpp index f33e3a10..3c842569 100644 --- a/Strategic/strategicmap.cpp +++ b/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" diff --git a/Tactical/AStarPathfinder.cpp b/Tactical/AStarPathfinder.cpp index a7be0830..5240a6cd 100644 --- a/Tactical/AStarPathfinder.cpp +++ b/Tactical/AStarPathfinder.cpp @@ -1,7 +1,6 @@ //#include "stdafx.h" #include "profiler.h" -#include "BinaryHeap.hpp" using namespace std; diff --git a/Tactical/Air Raid.cpp b/Tactical/Air Raid.cpp index ff9f2d17..c77a334b 100644 --- a/Tactical/Air Raid.cpp +++ b/Tactical/Air Raid.cpp @@ -6,7 +6,6 @@ #include "air raid.h" #include "game event hook.h" #include "game clock.h" - #include "auto bandage.h" #include "strategicmap.h" #include "PreBattle Interface.h" #include "screenids.h" @@ -20,7 +19,6 @@ #include "message.h" #include "isometric utils.h" #include "soldier macros.h" - #include "worldman.h" #include "los.h" #include "math.h" #include "explosion control.h" diff --git a/Tactical/Animation Cache.cpp b/Tactical/Animation Cache.cpp index 9635efa1..8c7bc330 100644 --- a/Tactical/Animation Cache.cpp +++ b/Tactical/Animation Cache.cpp @@ -11,7 +11,6 @@ #include "Animation Cache.h" #include "Animation Data.h" #include "Animation Control.h" - #include "sys globals.h" #include "Debug Control.h" #endif diff --git a/Tactical/Animation Control.cpp b/Tactical/Animation Control.cpp index ad08bd09..c10ef61a 100644 --- a/Tactical/Animation Control.cpp +++ b/Tactical/Animation Control.cpp @@ -4,7 +4,6 @@ #include "builddefines.h" #include #include -#include "wcheck.h" #include "stdlib.h" #include "debug.h" #include "Animation Control.h" @@ -16,7 +15,6 @@ #include "worlddef.h" #include "worldman.h" #include "rotting corpses.h" -#include "points.h" #include "Debug Control.h" #include "Random.h" #include "Soldier Control.h" diff --git a/Tactical/Animation Data.cpp b/Tactical/Animation Data.cpp index 600510e8..cd628244 100644 --- a/Tactical/Animation Data.cpp +++ b/Tactical/Animation Data.cpp @@ -16,7 +16,6 @@ #include "Debug Control.h" #include "utilities.h" #include "worlddef.h" - #include "worldman.h" #include "Fileman.h" #endif diff --git a/Tactical/Auto Bandage.cpp b/Tactical/Auto Bandage.cpp index 63528479..352dd422 100644 --- a/Tactical/Auto Bandage.cpp +++ b/Tactical/Auto Bandage.cpp @@ -16,7 +16,6 @@ #include "renderworld.h" #include "strategic turns.h" #include "Event Pump.h" - #include "music control.h" #include "dialogue control.h" #include "ai.h" #include "interface control.h" diff --git a/Tactical/Campaign.cpp b/Tactical/Campaign.cpp index 907b4b46..0c270f69 100644 --- a/Tactical/Campaign.cpp +++ b/Tactical/Campaign.cpp @@ -5,7 +5,6 @@ #include #include #include - #include "wcheck.h" #include "stdlib.h" #include "debug.h" #include "MemMan.h" diff --git a/Tactical/Dialogue Control.cpp b/Tactical/Dialogue Control.cpp index 1c522fd4..5a9f9afa 100644 --- a/Tactical/Dialogue Control.cpp +++ b/Tactical/Dialogue Control.cpp @@ -39,7 +39,6 @@ #include "Map Screen Interface.h" #include "text.h" #include "Merc Contract.h" - #include "history.h" #include "Town Militia.h" #include "meanwhile.h" #include "SkillCheck.h" diff --git a/Tactical/End Game.cpp b/Tactical/End Game.cpp index bb10c45a..f6ff36e7 100644 --- a/Tactical/End Game.cpp +++ b/Tactical/End Game.cpp @@ -5,18 +5,14 @@ #else #include "Overhead.h" - #include "Boxing.h" #include "Render Fun.h" #include "Random.h" #include "Worldman.h" #include "Soldier Profile.h" #include "NPC.h" - #include "Opplist.h" #include "ai.h" #include "Dialogue Control.h" #include "Handle UI.h" - #include "Points.h" - #include "interface.h" #include "end game.h" #include "Intro.h" #include "Exit Grids.h" diff --git a/Tactical/Enemy Soldier Save.cpp b/Tactical/Enemy Soldier Save.cpp index 5e47cefd..fc076a1e 100644 --- a/Tactical/Enemy Soldier Save.cpp +++ b/Tactical/Enemy Soldier Save.cpp @@ -20,11 +20,9 @@ #include "Random.h" #include "items.h" - #include "cursors.h" #include "Map Information.h" #include "soldier profile.h" - #include "Sys Globals.h" #include "EditorMercs.h" #include "Animation Data.h" #include "message.h" diff --git a/Tactical/Food.cpp b/Tactical/Food.cpp index 8329871e..b33e050e 100644 --- a/Tactical/Food.cpp +++ b/Tactical/Food.cpp @@ -17,7 +17,6 @@ #include "Sound Control.h" #include "Assignments.h" #include "Overhead.h" - #include "worldman.h" #include "Isometric Utils.h" #include "Campaign Types.h" #include "Drugs And Alcohol.h" diff --git a/Tactical/GAP.cpp b/Tactical/GAP.cpp index 77df8e32..1829b11d 100644 --- a/Tactical/GAP.cpp +++ b/Tactical/GAP.cpp @@ -8,7 +8,6 @@ #include "gap.h" #include "Sound Control.h" #include "soundman.h" - #include "Timer Control.h" #include #include "FileMan.h" #endif diff --git a/Tactical/Handle Doors.cpp b/Tactical/Handle Doors.cpp index 6e97d365..960cdb4a 100644 --- a/Tactical/Handle Doors.cpp +++ b/Tactical/Handle Doors.cpp @@ -4,7 +4,6 @@ #else #include "builddefines.h" #include - #include #include #include "sgp.h" #include "worlddef.h" @@ -14,7 +13,6 @@ #include "Animation Control.h" #include "points.h" #include "overhead.h" - #include "structure wrap.h" #include "tile animation.h" #include "Interactive Tiles.h" #include "handle doors.h" diff --git a/Tactical/Handle Items.cpp b/Tactical/Handle Items.cpp index 638c58e4..1d600e9e 100644 --- a/Tactical/Handle Items.cpp +++ b/Tactical/Handle Items.cpp @@ -55,14 +55,12 @@ #include "Opplist.h" #include "qarray.h" #include "render fun.h" - #include "environment.h" #include "Map Information.h" #include "GameSettings.h" #include "end game.h" #include "interface control.h" #include "Map Screen Interface Map Inventory.h" // added by SANDRO - #include "Game Clock.h" #include "Morale.h" // added by Flugente #include "drugs and alcohol.h" diff --git a/Tactical/Handle UI.cpp b/Tactical/Handle UI.cpp index 73561e47..3ec075a7 100644 --- a/Tactical/Handle UI.cpp +++ b/Tactical/Handle UI.cpp @@ -7,7 +7,6 @@ #include "builddefines.h" #include #include -#include "wcheck.h" #include "stdlib.h" #include "debug.h" #include "math.h" @@ -34,7 +33,6 @@ #include "opplist.h" #include "worldman.h" #include "weapons.h" -#include "Sound Control.h" #include "renderworld.h" #include "structure.h" #include "interface panels.h" @@ -71,7 +69,6 @@ #include "text.h" #include "dialogue control.h" #include "line.h" -#include "render dirty.h" #include "GameSettings.h" #include "los.h" #include "Campaign Types.h" @@ -7068,4 +7065,4 @@ BOOLEAN IsValidJumpLocation( SOLDIERTYPE *pSoldier, INT32 sGridNo, BOOLEAN fChec } return( FALSE ); -} \ No newline at end of file +} diff --git a/Tactical/Interface Control.cpp b/Tactical/Interface Control.cpp index 53932d90..6db2b30a 100644 --- a/Tactical/Interface Control.cpp +++ b/Tactical/Interface Control.cpp @@ -2,7 +2,6 @@ #include "Tactical All.h" #else #include - #include #include #include "sgp.h" #include "gameloop.h" @@ -14,13 +13,11 @@ #include "Button System.h" #include "interface.h" #include "vsurface.h" - #include "wcheck.h" #include "input.h" #include "Handle UI.h" #include "Animation Control.h" #include "Animation Data.h" #include "renderworld.h" - #include "sys globals.h" #include "cursors.h" #include "radar screen.h" #include "worldman.h" @@ -28,7 +25,6 @@ #include "render dirty.h" #include "utilities.h" #include "interface cursors.h" - #include "Sound Control.h" #include "lighting.h" #include "Interface Panels.h" #include "pathai.h" diff --git a/Tactical/Interface Cursors.cpp b/Tactical/Interface Cursors.cpp index 34e7800e..21612d16 100644 --- a/Tactical/Interface Cursors.cpp +++ b/Tactical/Interface Cursors.cpp @@ -2,18 +2,15 @@ #include "Tactical All.h" #else #include - #include #include #include "sgp.h" #include "mousesystem.h" #include "vsurface.h" - #include "wcheck.h" #include "input.h" #include "Handle UI.h" #include "cursors.h" #include "worlddef.h" #include "worldman.h" - #include "render dirty.h" #include "Interface Cursors.h" #include "interface.h" #include "Isometric utils.h" diff --git a/Tactical/Interface Dialogue.cpp b/Tactical/Interface Dialogue.cpp index 219d0f72..0d8b5417 100644 --- a/Tactical/Interface Dialogue.cpp +++ b/Tactical/Interface Dialogue.cpp @@ -10,7 +10,6 @@ #include "Encrypted File.h" #include "faces.h" #include "wcheck.h" - #include "render dirty.h" #include "soldier profile.h" #include "wordwrap.h" #include "sysutil.h" @@ -61,7 +60,6 @@ // including this for Strategic AI.h #include "Strategic Movement.h" #include "Strategic AI.h" - #include "Handle Doors.h" #include "Soldier create.h" #include "SkillCheck.h" #include "Sound Control.h" diff --git a/Tactical/Interface Enhanced.cpp b/Tactical/Interface Enhanced.cpp index 17f401cb..64cbe4b5 100644 --- a/Tactical/Interface Enhanced.cpp +++ b/Tactical/Interface Enhanced.cpp @@ -4,7 +4,6 @@ #else #include "builddefines.h" #include - #include #include #include "sgp.h" #include "gameloop.h" @@ -20,18 +19,11 @@ #include "input.h" #include "Handle UI.h" #include "renderworld.h" - #include "sys globals.h" - #include "cursors.h" - #include "radar screen.h" - #include "worldman.h" #include "Font Control.h" - #include "render dirty.h" #include "utilities.h" - #include "Sound Control.h" #include "Interface Panels.h" #include "Animation Control.h" #include "Soldier Control.h" - #include "pathai.h" #include "weapons.h" #include "lighting.h" #include "faces.h" @@ -41,28 +33,20 @@ #include "Interface Items.h" #include "Font Control.h" #include "Cursor Control.h" - #include "interface cursors.h" #include "interface utils.h" #include "interface items.h" #include "wordwrap.h" - #include "interface control.h" #include "vobject_blitters.h" #include "world items.h" #include "points.h" #include "physics.h" - #include "finances.h" - #include "ui cursors.h" #include "handle ui.h" #include "ShopKeeper Interface.h" - #include "dialogue control.h" #include "english.h" #include "keys.h" #include "Strategicmap.h" - #include "Arms Dealer Init.h" #include "soldier macros.h" - #include "game clock.h" #include "squads.h" - #include "LaptopSave.h" #include "MessageBoxScreen.h" #include "Language Defines.h" #include "GameSettings.h" @@ -70,7 +54,6 @@ #include "Quests.h" #include "Map Screen Interface.h" #include "Campaign Types.h" - #include "opplist.h" #include "los.h" #include "Map Screen Interface Map.h" #include "Food.h" // added by Flugente diff --git a/Tactical/Interface Items.cpp b/Tactical/Interface Items.cpp index 05add7dd..e832f3bc 100644 --- a/Tactical/Interface Items.cpp +++ b/Tactical/Interface Items.cpp @@ -24,11 +24,9 @@ #include "sys globals.h" #include "cursors.h" #include "radar screen.h" - #include "worldman.h" #include "Font Control.h" #include "render dirty.h" #include "utilities.h" - #include "Sound Control.h" #include "Interface Panels.h" #include "Animation Control.h" #include "Soldier Control.h" @@ -59,11 +57,9 @@ #include "english.h" #include "keys.h" #include "Strategicmap.h" - #include "Arms Dealer Init.h" #include "soldier macros.h" #include "game clock.h" #include "squads.h" - #include "LaptopSave.h" #include "MessageBoxScreen.h" #include "Language Defines.h" #include "GameSettings.h" diff --git a/Tactical/Interface Panels.cpp b/Tactical/Interface Panels.cpp index a0d2b15e..6e2efee5 100644 --- a/Tactical/Interface Panels.cpp +++ b/Tactical/Interface Panels.cpp @@ -3,7 +3,6 @@ #else #include "builddefines.h" #include - #include #include #include "sgp.h" #include "gameloop.h" @@ -19,10 +18,8 @@ #include "input.h" #include "Handle UI.h" #include "renderworld.h" - #include "sys globals.h" #include "cursors.h" #include "radar screen.h" - #include "worldman.h" #include "Font Control.h" #include "render dirty.h" #include "utilities.h" diff --git a/Tactical/Interface Utils.cpp b/Tactical/Interface Utils.cpp index 38e8859d..a668d856 100644 --- a/Tactical/Interface Utils.cpp +++ b/Tactical/Interface Utils.cpp @@ -3,14 +3,12 @@ #else #include "builddefines.h" #include - #include #include "sgp.h" #include "himage.h" #include "vobject.h" #include "interface utils.h" #include "render dirty.h" #include "interface.h" - #include "interface control.h" #include "sysutil.h" #include "faces.h" #include "render dirty.h" diff --git a/Tactical/Items.cpp b/Tactical/Items.cpp index 3e7be03a..dad3103c 100644 --- a/Tactical/Items.cpp +++ b/Tactical/Items.cpp @@ -4,17 +4,14 @@ #include "items.h" #include "Action Items.h" #include "weapons.h" - #include "Interface Cursors.h" #include "Soldier Control.h" #include "overhead.h" #include "Handle UI.h" #include "Animation Control.h" #include "points.h" #include "Sound Control.h" - #include "Sys globals.h" #include "Isometric Utils.h" #include "Animation Data.h" - #include "worldman.h" #include "Random.h" #include "Campaign.h" #include "interface.h" @@ -33,17 +30,14 @@ #include "fov.h" #include "MessageBoxScreen.h" - #include "PathAIDebug.h" #include "Interface Control.h" #include "ShopKeeper Interface.h" - #include "Cursors.h" #include "GameSettings.h" #include "environment.h" #include "Auto Resolve.h" #include "Interface Items.h" #include "Campaign Types.h" - #include "history.h" #include "Game Clock.h" #include "strategicmap.h" #include "Inventory Choosing.h" diff --git a/Tactical/Ja25_Tactical.cpp b/Tactical/Ja25_Tactical.cpp index ddbe52d8..a3b0b915 100644 --- a/Tactical/Ja25_Tactical.cpp +++ b/Tactical/Ja25_Tactical.cpp @@ -2,48 +2,32 @@ #include "Tactical All.h" #else #include "items.h" - #include "Action Items.h" #include "weapons.h" - #include "Interface Cursors.h" #include "Soldier Control.h" #include "overhead.h" #include "Handle UI.h" #include "Animation Control.h" - #include "points.h" - #include "Sound Control.h" - #include "Sys globals.h" #include "Isometric Utils.h" #include "Animation Data.h" - #include "worldman.h" #include "Random.h" #include "Campaign.h" #include "interface.h" - #include "interface panels.h" - #include "explosion control.h" #include "Keys.h" - #include "wcheck.h" #include "soldier profile.h" #include "SkillCheck.h" #include "los.h" #include "message.h" #include "text.h" - #include "fov.h" #include "MessageBoxScreen.h" - #include "PathAIDebug.h" - #include "Interface Control.h" #include "ShopKeeper Interface.h" - #include "Cursors.h" #include "GameSettings.h" - #include "environment.h" #include "Auto Resolve.h" #include "Interface Items.h" #include "Campaign Types.h" - #include "history.h" - #include "Game Clock.h" #include "strategicmap.h" #include "Inventory Choosing.h" #include "Soldier macros.h" @@ -55,7 +39,9 @@ #endif #ifdef JA2UB - +#include "worldman.h" +#include "Game Clock.h" +#include "Sound Control.h" #include "Ja25 Strategic Ai.h" #include "MapScreen Quotes.h" #include "Ja25_Tactical.h" @@ -1962,4 +1948,4 @@ void HandleOpenControlPanelToRevealSwitchInMorrisArea() } } } -#endif \ No newline at end of file +#endif diff --git a/Tactical/Map Information.cpp b/Tactical/Map Information.cpp index a9313984..741cbdd6 100644 --- a/Tactical/Map Information.cpp +++ b/Tactical/Map Information.cpp @@ -9,15 +9,12 @@ #include "Soldier Init List.h" #include "Random.h" #include "worlddef.h" - #include "worldman.h" #include "renderworld.h" #include "EditorMercs.h" #include "Exit Grids.h" #include "Isometric Utils.h" - #include "ja2.h" #include "Animation Data.h" #include "Road Smoothing.h" - #include "sys globals.h" #include "message.h" #include "weapons.h" #include "environment.h" diff --git a/Tactical/Merc Entering.cpp b/Tactical/Merc Entering.cpp index 792dbd16..4834a8bb 100644 --- a/Tactical/Merc Entering.cpp +++ b/Tactical/Merc Entering.cpp @@ -4,7 +4,6 @@ #include "builddefines.h" #include #include - #include "wcheck.h" #include "stdlib.h" #include "debug.h" //#include "soldier control.h" @@ -13,7 +12,6 @@ #include "weapons.h" #include "handle items.h" #include "worlddef.h" - #include "worldman.h" #include "rotting corpses.h" #include "tile cache.h" #include "isometric utils.h" @@ -30,7 +28,6 @@ #include "Handle UI.h" #include "squads.h" #include "english.h" - #include "cursors.h" #include "cursor control.h" #include "Merc Hiring.h" #include "Font Control.h" diff --git a/Tactical/Merc Hiring.cpp b/Tactical/Merc Hiring.cpp index 61dcc86b..17907f30 100644 --- a/Tactical/Merc Hiring.cpp +++ b/Tactical/Merc Hiring.cpp @@ -5,12 +5,10 @@ #include "builddefines.h" #include #include - #include "wcheck.h" #include "stdlib.h" #include "debug.h" #include "math.h" #include "worlddef.h" - #include "worldman.h" #include "renderworld.h" #include "Assignments.h" @@ -18,18 +16,13 @@ #include "Animation Data.h" #include "Isometric Utils.h" #include "Event Pump.h" - #include "Timer Control.h" #include "Render Fun.h" - #include "Render Dirty.h" - #include "mousesystem.h" #include "interface.h" #include "sysutil.h" #include "FileMan.h" - #include "points.h" #include "Random.h" #include "ai.h" #include "Interactive Tiles.h" - #include "soldier ani.h" #include "english.h" #include "overhead.h" #include "Soldier Profile.h" diff --git a/Tactical/Overhead.cpp b/Tactical/Overhead.cpp index ff133250..adcfdf9a 100644 --- a/Tactical/Overhead.cpp +++ b/Tactical/Overhead.cpp @@ -39,7 +39,6 @@ #include "lighting.h" #include "pathai.h" #include "screenids.h" -#include "interface cursors.h" #include "weapons.h" #include "rotting corpses.h" #include "lighting.h" @@ -51,7 +50,6 @@ #include "Soldier Profile.h" #include "fov.h" #include "Soldier macros.h" -#include "EditorMercs.h" #include "soldier tile.h" #ifdef NETWORKED #include "Networking.h" @@ -94,8 +92,6 @@ #include "Map Screen Helicopter.h" #include "interface control.h" #include "exit grids.h" -#include "fade screen.h" -#include "Game Init.h" #include "jascreens.h" #include "strategic.h" #include "arms dealer init.h" diff --git a/Tactical/PATHAI.cpp b/Tactical/PATHAI.cpp index bb4703a1..d4be3eca 100644 --- a/Tactical/PATHAI.cpp +++ b/Tactical/PATHAI.cpp @@ -13,7 +13,6 @@ #else #include #include - #include "wcheck.h" #include "stdlib.h" #include "debug.h" #include "MemMan.h" @@ -32,7 +31,6 @@ #include "worldman.h" // #include "renderworld.h" #include "pathai.h" - #include "PathAIDebug.h" #include "Points.h" #include "ai.h" #include "Random.h" @@ -44,7 +42,6 @@ #include "soldier profile.h" // added by SANDRO #endif #include "connect.h" -#include "PathAIDebug.h" #include "LOS.h" //ddd diff --git a/Tactical/Rain.cpp b/Tactical/Rain.cpp index ebd04706..707ab29c 100644 --- a/Tactical/Rain.cpp +++ b/Tactical/Rain.cpp @@ -5,13 +5,10 @@ //#include "soldier control.h" #include "overhead.h" #include "animation control.h" - #include "points.h" - #include "opplist.h" #include "timer.h" #include "event pump.h" // #include "Sound Control.h" #include "interface.h" - #include "Isometric Utils.h" #include "Font Control.H" #include "ai.h" #include "interface.h" @@ -19,22 +16,14 @@ #include "text.h" #include "TeamTurns.h" #include "Smell.h" - #include "game clock.h" #include "Soldier Functions.h" #include "cursors.h" #include "Queen Command.h" - #include "Pathai.h" - #include "Music Control.h" - #include "Strategic Turns.h" #include "lighting.h" #include "environment.h" - #include "Explosion Control.h" #include "dialogue control.h" #include "Soldier Profile Type.h" - #include "SmokeEffects.h" - #include "lighteffects.h" #include "air raid.h" - #include "meanwhile.h" #include "SkillCheck.h" #include "AIInternals.h" #include "AIList.h" diff --git a/Tactical/Real Time Input.cpp b/Tactical/Real Time Input.cpp index 3523c491..dd44b871 100644 --- a/Tactical/Real Time Input.cpp +++ b/Tactical/Real Time Input.cpp @@ -3,7 +3,6 @@ #else #include #include -#include "wcheck.h" #include "stdlib.h" #include "debug.h" #include "math.h" @@ -14,7 +13,6 @@ #include "Animation Data.h" #include "Event Pump.h" #include "Timer Control.h" -#include "cursors.h" #include "Handle UI.h" #include "Isometric Utils.h" #include "input.h" @@ -23,20 +21,12 @@ #include "screenids.h" #include "interface.h" #include "cursor control.h" -#include "points.h" #include "Interactive Tiles.h" -#include "interface cursors.h" -#include "Sound Control.h" -#include "environment.h" -#include "opplist.h" #include "spread burst.h" -#include "overhead map.h" #include "world items.h" -#include "Game Clock.h" #include "interface items.h" #include "physics.h" #include "ui cursors.h" -#include "worldman.h" #include "strategicmap.h" #include "soldier profile.h" #include "soldier create.h" @@ -46,10 +36,7 @@ #include "interactive tiles.h" #include "messageboxscreen.h" #include "gameloop.h" -#include "gamescreen.h" #include "spread burst.h" -#include "tile animation.h" -#include "merc entering.h" #include "explosion control.h" #include "message.h" #include "Strategic Exit GUI.h" @@ -1962,4 +1949,4 @@ void QueryRTX2Button( UINT32 *puiNewEvent ) } } -} \ No newline at end of file +} diff --git a/Tactical/ShopKeeper Interface.cpp b/Tactical/ShopKeeper Interface.cpp index 0c8a01e2..59165949 100644 --- a/Tactical/ShopKeeper Interface.cpp +++ b/Tactical/ShopKeeper Interface.cpp @@ -6,7 +6,6 @@ #include "Utilities.h" #include "Game Clock.h" #include "Render Dirty.h" - #include "wCheck.h" #include "Font Control.h" #include "WordWrap.h" #include "Text Input.h" @@ -54,7 +53,6 @@ #include "PATHAI.h" #include "Points.h" #include "InterfaceItemImages.h" - #include "Interface Enhanced.h" #endif #ifdef JA2UB diff --git a/Tactical/Soldier Ani.cpp b/Tactical/Soldier Ani.cpp index 23b529e1..362eca25 100644 --- a/Tactical/Soldier Ani.cpp +++ b/Tactical/Soldier Ani.cpp @@ -3,7 +3,6 @@ #else #include #include -#include "wcheck.h" #include "stdlib.h" #include "debug.h" #include "MemMan.h" diff --git a/Tactical/Soldier Control.cpp b/Tactical/Soldier Control.cpp index e63ccb47..001c23f1 100644 --- a/Tactical/Soldier Control.cpp +++ b/Tactical/Soldier Control.cpp @@ -21,12 +21,9 @@ #include "Random.h" #include "worldman.h" #include "Isometric Utils.h" -#include "Render Dirty.h" #include "renderworld.h" -#include "sys globals.h" #include "video.h" #include "points.h" -#include "Win util.h" #include "Sound Control.h" #include "weapons.h" #include "vobject_blitters.h" @@ -40,7 +37,6 @@ #include "faces.h" #include "Soldier Profile.h" #include "gap.h" -#include "interface panels.h" #include "campaign.h" #include "soldier macros.h" #include "english.h" @@ -62,7 +58,6 @@ #include "soldier functions.h" #include "rt time defines.h" #include "Exit Grids.h" -#include "gamescreen.h" #include "Quests.h" #include "message.h" #include "NPC.h" @@ -73,7 +68,6 @@ #include "GameSettings.h" #include "tile animation.h" #include "ShopKeeper Interface.h" -#include "Arms Dealer Init.h" #include "vehicles.h" #include "rotting corpses.h" #include "Interface Control.h" diff --git a/Tactical/Soldier Create.cpp b/Tactical/Soldier Create.cpp index 29e68adf..6d045bdd 100644 --- a/Tactical/Soldier Create.cpp +++ b/Tactical/Soldier Create.cpp @@ -14,14 +14,12 @@ #include "overhead types.h" #include "faces.h" #include "isometric utils.h" - #include "worldman.h" #include "items.h" #include "weapons.h" #include "opplist.h" #include "random.h" #include "Assignments.h" #include "Soldier Init List.h" - #include "EditorMercs.h" #include "Smell.h" #include "Squads.h" #include "Interface Panels.h" diff --git a/Tactical/Soldier Find.cpp b/Tactical/Soldier Find.cpp index 0b366219..672af9a7 100644 --- a/Tactical/Soldier Find.cpp +++ b/Tactical/Soldier Find.cpp @@ -3,7 +3,6 @@ #else #include #include - #include "wcheck.h" #include "stdlib.h" #include "debug.h" #include "math.h" @@ -16,38 +15,29 @@ #include "Animation Data.h" #include "Isometric Utils.h" #include "Event Pump.h" - #include "Timer Control.h" #include "Render Fun.h" - #include "Render Dirty.h" #include "mousesystem.h" #include "interface.h" #include "sysutil.h" #include "FileMan.h" - #include "points.h" #include "Random.h" #include "ai.h" #include "Interactive Tiles.h" - #include "soldier ani.h" #include "english.h" #include "overhead.h" - #include "opplist.h" //#include "Sound Control.h" - #include "Font Control.h" #include "lighting.h" #include "pathai.h" #include "screenids.h" - #include "interface cursors.h" #include "weapons.h" #include "lighting.h" #include "Handle UI Plan.h" #include "structure.h" - #include "interface panels.h" #include "message.h" #include "items.h" #include "Soldier Profile.h" #include "fov.h" #include "Soldier macros.h" - #include "EditorMercs.h" #include "soldier tile.h" #include "soldier find.h" #include "Vehicles.h" diff --git a/Tactical/Soldier Init List.cpp b/Tactical/Soldier Init List.cpp index 54a8a2f1..dd6b4f9f 100644 --- a/Tactical/Soldier Init List.cpp +++ b/Tactical/Soldier Init List.cpp @@ -19,7 +19,6 @@ #include "items.h" #include "GameSettings.h" -#include "cursors.h" #include "Map Information.h" #include "soldier profile.h" @@ -2853,4 +2852,4 @@ void SectorAddPrisonersofWar( INT16 sMapX, INT16 sMapY, INT16 sMapZ ) else break; } -} \ No newline at end of file +} diff --git a/Tactical/Soldier Profile.cpp b/Tactical/Soldier Profile.cpp index d4379eaa..9d42d29c 100644 --- a/Tactical/Soldier Profile.cpp +++ b/Tactical/Soldier Profile.cpp @@ -3,12 +3,10 @@ #else #include #include - #include "wcheck.h" #include "stdlib.h" #include "debug.h" #include "math.h" #include "worlddef.h" - #include "worldman.h" #include "renderworld.h" @@ -16,14 +14,10 @@ #include "Animation Data.h" #include "Isometric Utils.h" #include "Event Pump.h" - #include "Timer Control.h" #include "Render Fun.h" - #include "Render Dirty.h" - #include "mousesystem.h" #include "interface.h" #include "sysutil.h" #include "FileMan.h" - #include "points.h" #include "Random.h" #include "ai.h" #include "Interactive Tiles.h" @@ -2718,4 +2712,4 @@ INT8 ProfileHasSkillTrait( INT32 ubProfileID, INT8 bSkillTrait ) else return ( bNumTraits ); } -} \ No newline at end of file +} diff --git a/Tactical/Soldier Tile.cpp b/Tactical/Soldier Tile.cpp index af73a945..02998791 100644 --- a/Tactical/Soldier Tile.cpp +++ b/Tactical/Soldier Tile.cpp @@ -4,7 +4,6 @@ #include #include #include - #include "wcheck.h" #include "Render Fun.h" #include "stdlib.h" #include "debug.h" @@ -15,23 +14,18 @@ #include "Animation Data.h" #include "Animation Control.h" #include "container.h" - #include #include "pathai.h" #include "Random.h" #include "worldman.h" #include "Isometric Utils.h" - #include "Render Dirty.h" #include "renderworld.h" - #include "sys globals.h" #include "video.h" #include "points.h" - #include "Win util.h" // #include "Sound Control.h" #include "lighting.h" #include "weapons.h" #include "vobject_blitters.h" #include "Handle UI.h" - #include "soldier ani.h" #include "Event pump.h" #include "opplist.h" #include "ai.h" @@ -39,16 +33,12 @@ #include "lighting.h" #include "faces.h" #include "Soldier Profile.h" - #include "gap.h" - #include "interface panels.h" - #include "campaign.h" #ifdef NETWORKED #include "Networking.h" #include "NetworkEvent.h" #endif - #include "structure wrap.h" #include "items.h" #include "Soundman.h" #include "soldier tile.h" diff --git a/Tactical/Spread Burst.cpp b/Tactical/Spread Burst.cpp index 1bc4505f..5c82e40c 100644 --- a/Tactical/Spread Burst.cpp +++ b/Tactical/Spread Burst.cpp @@ -3,13 +3,11 @@ #else #include #include - #include "wcheck.h" #include "stdlib.h" #include "debug.h" //#include "soldier control.h" #include "weapons.h" #include "cursor control.h" - #include "cursors.h" #include "soldier find.h" #include "isometric utils.h" #include "renderworld.h" diff --git a/Tactical/Squads.cpp b/Tactical/Squads.cpp index c5aa2e75..8e6c1424 100644 --- a/Tactical/Squads.cpp +++ b/Tactical/Squads.cpp @@ -9,7 +9,6 @@ #include "Strategic Movement.h" #include "Assignments.h" #include "OverHead.h" - #include "RenderWorld.h" #include "Interface.h" #include "Vehicles.h" #include "Map Screen Helicopter.h" diff --git a/Tactical/Strategic Exit GUI.cpp b/Tactical/Strategic Exit GUI.cpp index f6ff728b..e614fa9e 100644 --- a/Tactical/Strategic Exit GUI.cpp +++ b/Tactical/Strategic Exit GUI.cpp @@ -11,7 +11,6 @@ #include "gamescreen.h" #include "strategicmap.h" #include "Game Clock.h" - #include "Music Control.h" #include "sysutil.h" #include "Font Control.h" #include "text.h" diff --git a/Tactical/Structure Wrap.cpp b/Tactical/Structure Wrap.cpp index 120651f3..d7deb642 100644 --- a/Tactical/Structure Wrap.cpp +++ b/Tactical/Structure Wrap.cpp @@ -3,7 +3,6 @@ #else #include #include "debug.h" - #include "wcheck.h" #include "worlddef.h" #include "worldman.h" #include "structure wrap.h" @@ -664,4 +663,4 @@ BOOLEAN SetOpenableStructureToClosed( INT32 sGridNo, UINT8 ubLevel ) } // else leave it as is! return( TRUE ); -} \ No newline at end of file +} diff --git a/Tactical/Tactical Turns.cpp b/Tactical/Tactical Turns.cpp index c5750b90..95e4715b 100644 --- a/Tactical/Tactical Turns.cpp +++ b/Tactical/Tactical Turns.cpp @@ -4,22 +4,18 @@ #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" #include "isometric utils.h" #include "animation data.h" #include "animation control.h" #include "Tactical Turns.h" - #include "points.h" #include "smell.h" #include "opplist.h" #include "Queen Command.h" diff --git a/Tactical/TeamTurns.cpp b/Tactical/TeamTurns.cpp index 18e1990a..6b308c27 100644 --- a/Tactical/TeamTurns.cpp +++ b/Tactical/TeamTurns.cpp @@ -23,8 +23,6 @@ #include "cursors.h" #include "Queen Command.h" #include "Pathai.h" - #include "Music Control.h" - #include "Strategic Turns.h" #include "lighting.h" #include "environment.h" #include "Explosion Control.h" diff --git a/Tactical/Turn Based Input.cpp b/Tactical/Turn Based Input.cpp index cf1382e1..0c4dd40d 100644 --- a/Tactical/Turn Based Input.cpp +++ b/Tactical/Turn Based Input.cpp @@ -10,7 +10,6 @@ #include "builddefines.h" #include #include -#include "wcheck.h" #include "stdlib.h" #include "debug.h" #include "math.h" @@ -21,7 +20,6 @@ #include "Animation Data.h" #include "Event Pump.h" #include "Timer Control.h" -#include "cursors.h" #include "Handle UI.h" #include "Isometric Utils.h" #include "input.h" @@ -65,16 +63,13 @@ #include "interactive tiles.h" #include "messageboxscreen.h" #include "gameloop.h" -#include "gamescreen.h" + #include "spread burst.h" -#include "tile animation.h" -#include "merc entering.h" #include "explosion control.h" #include "QuestDebug.h" #include "assignments.h" #include "EditScreen.h" #include "SaveLoadGame.h" -#include "Structure Wrap.h" #include "los.h" #include "Exit Grids.h" #include "Strategic Exit GUI.h" @@ -96,7 +91,6 @@ #include "ShopKeeper Interface.h" #include "GameSettings.h" #include "vehicles.h" -#include "GameVersion.h" #include "SaveLoadScreen.h" #include "Air raid.h" #include "meanwhile.h" diff --git a/Tactical/Vehicles.cpp b/Tactical/Vehicles.cpp index 28501c1a..bad42bb6 100644 --- a/Tactical/Vehicles.cpp +++ b/Tactical/Vehicles.cpp @@ -17,7 +17,6 @@ #include "interface panels.h" #include "strategic.h" #include "worlddef.h" - #include "tile animation.h" #include "Isometric Utils.h" #include "Mapscreen.h" #include "message.h" diff --git a/Tactical/Weapons.cpp b/Tactical/Weapons.cpp index 68433162..ab306cbb 100644 --- a/Tactical/Weapons.cpp +++ b/Tactical/Weapons.cpp @@ -9,7 +9,6 @@ #include "Event Pump.h" #include "weapons.h" #include "Animation Control.h" - #include "sys globals.h" #include "Handle UI.h" #include "Isometric Utils.h" #include "worldman.h" diff --git a/Tactical/World Items.cpp b/Tactical/World Items.cpp index f5ce6c1a..92f4b1e2 100644 --- a/Tactical/World Items.cpp +++ b/Tactical/World Items.cpp @@ -5,15 +5,12 @@ #include "handle Items.h" #include "overhead.h" #include "weapons.h" - #include "points.h" #include "tiledef.h" #include "worlddef.h" - #include "worldman.h" #include "interface.h" #include "renderworld.h" #include "Animation Control.h" #include "font control.h" - #include "render dirty.h" #include "World items.h" #include "debug.h" #include "Isometric utils.h" diff --git a/Tactical/XML_BurstSounds.cpp b/Tactical/XML_BurstSounds.cpp index bdb183d0..e532dd4e 100644 --- a/Tactical/XML_BurstSounds.cpp +++ b/Tactical/XML_BurstSounds.cpp @@ -9,23 +9,18 @@ #include "Event Pump.h" #include "weapons.h" #include "Animation Control.h" - #include "sys globals.h" #include "Handle UI.h" #include "Isometric Utils.h" - #include "worldman.h" #include "math.h" - #include "points.h" #include "ai.h" #include "los.h" #include "renderworld.h" - #include "opplist.h" #include "interface.h" #include "message.h" #include "campaign.h" #include "items.h" #include "text.h" #include "Soldier Profile.h" - #include "tile animation.h" #include "Dialogue Control.h" #include "SkillCheck.h" #include "explosion control.h" @@ -35,7 +30,6 @@ #include "Vehicles.h" #include "bullets.h" #include "morale.h" - #include "meanwhile.h" #include "SkillCheck.h" #include "gamesettings.h" #include "SaveLoadMap.h" diff --git a/Tactical/XML_CivGroupNames.cpp b/Tactical/XML_CivGroupNames.cpp index ea38ff61..dba1d52d 100644 --- a/Tactical/XML_CivGroupNames.cpp +++ b/Tactical/XML_CivGroupNames.cpp @@ -6,7 +6,6 @@ #include "expat.h" #include "XML.h" #include "Interface.h" - #include "EditorMercs.h" #endif struct @@ -203,4 +202,4 @@ BOOLEAN ReadInCivGroupNamesStats( STR fileName, BOOLEAN localizedVersion) return( TRUE ); -} \ No newline at end of file +} diff --git a/Tactical/XML_EnemyWeaponDrops.cpp b/Tactical/XML_EnemyWeaponDrops.cpp index 81a41c5d..d0fe4448 100644 --- a/Tactical/XML_EnemyWeaponDrops.cpp +++ b/Tactical/XML_EnemyWeaponDrops.cpp @@ -7,33 +7,26 @@ #include "Event Pump.h" #include "weapons.h" #include "Animation Control.h" - #include "sys globals.h" #include "Handle UI.h" #include "Isometric Utils.h" - #include "worldman.h" #include "math.h" - #include "points.h" #include "ai.h" #include "los.h" #include "renderworld.h" - #include "opplist.h" #include "interface.h" #include "message.h" #include "campaign.h" #include "items.h" #include "text.h" #include "Soldier Profile.h" - #include "tile animation.h" #include "Dialogue Control.h" #include "SkillCheck.h" - #include "explosion control.h" #include "Quests.h" #include "Physics.h" #include "Random.h" #include "Vehicles.h" #include "bullets.h" #include "morale.h" - #include "meanwhile.h" #include "SkillCheck.h" #include "gamesettings.h" #include "SaveLoadMap.h" diff --git a/Tactical/XML_SpreadPatterns.cpp b/Tactical/XML_SpreadPatterns.cpp index c01d1a21..b94375a1 100644 --- a/Tactical/XML_SpreadPatterns.cpp +++ b/Tactical/XML_SpreadPatterns.cpp @@ -4,22 +4,17 @@ #else #include "sgp.h" #include "overhead types.h" - #include "Sound Control.h" #include "Soldier Control.h" #include "overhead.h" #include "Event Pump.h" #include "weapons.h" #include "Animation Control.h" - #include "sys globals.h" #include "Handle UI.h" #include "Isometric Utils.h" - #include "worldman.h" #include "math.h" - #include "points.h" #include "ai.h" #include "los.h" #include "renderworld.h" - #include "opplist.h" #include "interface.h" #include "message.h" #include "campaign.h" @@ -27,17 +22,14 @@ #include "weapons.h" #include "text.h" #include "Soldier Profile.h" - #include "tile animation.h" #include "Dialogue Control.h" #include "SkillCheck.h" - #include "explosion control.h" #include "Quests.h" #include "Physics.h" #include "Random.h" #include "Vehicles.h" #include "bullets.h" #include "morale.h" - #include "meanwhile.h" #include "SkillCheck.h" #include "gamesettings.h" #include "SaveLoadMap.h" diff --git a/Tactical/bullets.cpp b/Tactical/bullets.cpp index f3c8ce8a..c42d47fc 100644 --- a/Tactical/bullets.cpp +++ b/Tactical/bullets.cpp @@ -9,7 +9,6 @@ #include "worlddef.h" #include "renderworld.h" #include "vsurface.h" - #include "Render Dirty.h" #include "sysutil.h" #include "container.h" #include "wcheck.h" @@ -18,7 +17,6 @@ #include "faces.h" #include "utilities.h" #include "overhead.h" - #include "gap.h" #include "Soldier Profile.h" #include "Bullets.h" #include "los.h" diff --git a/Tactical/opplist.cpp b/Tactical/opplist.cpp index a81bc48d..bec37365 100644 --- a/Tactical/opplist.cpp +++ b/Tactical/opplist.cpp @@ -12,14 +12,12 @@ #include "opplist.h" #include "ai.h" #include "font control.h" - #include "sys globals.h" #include "Animation COntrol.h" #include "los.h" #include "fov.h" #include "dialogue control.h" #include "lighting.h" #include "environment.h" - #include "Points.h" #include "interface dialogue.h" #include "message.h" #include "soldier profile.h" diff --git a/TacticalAI/AIMain.cpp b/TacticalAI/AIMain.cpp index d310f3df..357159ce 100644 --- a/TacticalAI/AIMain.cpp +++ b/TacticalAI/AIMain.cpp @@ -2,9 +2,7 @@ #include "AI All.h" #include "sound control.h" #include "Debug Control.h" -#include "cheats.h" #else -#include "wcheck.h" #include "sgp.h" #include "ai.h" #include "Isometric Utils.h" @@ -13,7 +11,6 @@ #include "Event Pump.h" #include "Soldier Control.h" #include "Overhead Types.h" -#include "sys globals.h" #include "opplist.h" #include "animation control.h" #include "font control.h" @@ -53,7 +50,6 @@ #include "Quests.h" #include "Campaign Types.h" #include "Queen Command.h" -#include "cheats.h" #include "points.h" #include "Soldier Functions.h" // added by SANDRO #endif diff --git a/TacticalAI/AIUtils.cpp b/TacticalAI/AIUtils.cpp index f5165006..5d3a41fe 100644 --- a/TacticalAI/AIUtils.cpp +++ b/TacticalAI/AIUtils.cpp @@ -9,7 +9,6 @@ #include "WorldMan.h" #include "AIInternals.h" #include "Items.h" - #include "wcheck.h" #include "message.h" #include "los.h" #include "assignments.h" diff --git a/TacticalAI/FindLocations.cpp b/TacticalAI/FindLocations.cpp index d4a80d0e..0e2ccc0f 100644 --- a/TacticalAI/FindLocations.cpp +++ b/TacticalAI/FindLocations.cpp @@ -18,7 +18,6 @@ #include "Render Fun.h" #include "Boxing.h" #include "Text.h" - #include "Structure Wrap.h" #ifdef _DEBUG #include "renderworld.h" #include "video.h" @@ -32,7 +31,6 @@ #include "Soldier Profile.h" #endif -#include "PathAIDebug.h" //////////////////////////////////////////////////////////////////////////////////////////////////////// // SANDRO - all "APBPConstants[AP_CROUCH]" and "APBPConstants[AP_PRONE]" here diff --git a/TacticalAI/Medical.cpp b/TacticalAI/Medical.cpp index 2e4eeb3e..7dcc6548 100644 --- a/TacticalAI/Medical.cpp +++ b/TacticalAI/Medical.cpp @@ -2,7 +2,6 @@ #include "AI All.h" #else #include "types.h" - #include "wcheck.h" #include "Soldier Functions.h" #include "ai.h" diff --git a/TacticalAI/NPC.cpp b/TacticalAI/NPC.cpp index 1f246c21..36ac2c0c 100644 --- a/TacticalAI/NPC.cpp +++ b/TacticalAI/NPC.cpp @@ -19,13 +19,11 @@ #include "items.h" #include "interface.h" #include "Assignments.h" - #include "QuestDebug.h" #include "soldier macros.h" #include "dialogue control.h" #include "Strategic Town Loyalty.h" #include "message.h" #include "Timer Control.h" - #include "WorldMan.h" #include "Soldier Add.h" #include "Soldier Tile.h" #include "Weapons.h" diff --git a/TacticalAI/Realtime.cpp b/TacticalAI/Realtime.cpp index 1db3eddd..284c4b5d 100644 --- a/TacticalAI/Realtime.cpp +++ b/TacticalAI/Realtime.cpp @@ -4,10 +4,7 @@ #include "ai.h" #include "AIInternals.h" #include "Isometric utils.h" - #include "Points.h" #include "overhead.h" - #include "opplist.h" - #include "rotting corpses.h" #include "soldier add.h" #include "Soldier Profile Type.h" #include "Items.h" diff --git a/TileEngine/Explosion Control.cpp b/TileEngine/Explosion Control.cpp index 8ef780d4..c001a984 100644 --- a/TileEngine/Explosion Control.cpp +++ b/TileEngine/Explosion Control.cpp @@ -7,7 +7,6 @@ #else #include #include -#include "wcheck.h" #include "stdlib.h" #include "debug.h" //#include "soldier control.h" @@ -35,13 +34,11 @@ #include "tiledat.h" #include "interactive tiles.h" #include "SaveLoadMap.h" -#include "Handle Doors.h" #include "Message.h" #include "Random.h" #include "smokeeffects.h" #include "handle ui.h" #include "pathai.h" -#include "pits.h" #include "campaign Types.h" #include "strategicmap.h" #include "strategic.h" diff --git a/TileEngine/Fog Of War.cpp b/TileEngine/Fog Of War.cpp index 18bfa786..7e3ad84d 100644 --- a/TileEngine/Fog Of War.cpp +++ b/TileEngine/Fog Of War.cpp @@ -4,7 +4,6 @@ #include "types.h" #include "Fog Of War.h" #include "Isometric Utils.h" - #include "worldman.h" #include "Simple Render Utils.h" #include "Renderworld.h" #include "lighting.h" diff --git a/TileEngine/Interactive Tiles.cpp b/TileEngine/Interactive Tiles.cpp index ed5894d3..8b51ab1c 100644 --- a/TileEngine/Interactive Tiles.cpp +++ b/TileEngine/Interactive Tiles.cpp @@ -4,13 +4,10 @@ #include "TileEngine All.h" #else #include - #include #include #include "sgp.h" #include "himage.h" #include "vsurface.h" - #include "vsurface_private.h" - #include "wcheck.h" #include "sysutil.h" #include "renderworld.h" #include "interface.h" diff --git a/TileEngine/Isometric Utils.cpp b/TileEngine/Isometric Utils.cpp index 8efa52ee..f53c94fc 100644 --- a/TileEngine/Isometric Utils.cpp +++ b/TileEngine/Isometric Utils.cpp @@ -3,7 +3,6 @@ #else #include #include "debug.h" - #include "wcheck.h" #include "mousesystem.h" #include "jascreens.h" #include "worlddef.h" diff --git a/TileEngine/LightEffects.cpp b/TileEngine/LightEffects.cpp index c155b822..a2bc900a 100644 --- a/TileEngine/LightEffects.cpp +++ b/TileEngine/LightEffects.cpp @@ -5,22 +5,18 @@ #else #include #include - #include "wcheck.h" #include "stdlib.h" #include "debug.h" //#include "soldier control.h" #include "weapons.h" #include "handle items.h" #include "worlddef.h" - #include "worldman.h" #include "animation control.h" - #include "tile animation.h" #include "handle items.h" #include "lighteffects.h" #include "message.h" #include "isometric utils.h" #include "renderworld.h" - #include "explosion control.h" #include "Random.h" #include "lighting.h" #include "Game Clock.h" diff --git a/TileEngine/Map Edgepoints.cpp b/TileEngine/Map Edgepoints.cpp index 8b0f7715..2c445214 100644 --- a/TileEngine/Map Edgepoints.cpp +++ b/TileEngine/Map Edgepoints.cpp @@ -1,7 +1,6 @@ #ifdef PRECOMPILEDHEADERS #include "TileEngine All.h" #else - #include #include "Map Edgepoints.h" #include "pathai.h" diff --git a/TileEngine/Radar Screen.cpp b/TileEngine/Radar Screen.cpp index 71da6618..e6b8e05c 100644 --- a/TileEngine/Radar Screen.cpp +++ b/TileEngine/Radar Screen.cpp @@ -4,7 +4,6 @@ #include "TileEngine All.h" #else #include - #include #include #include "sgp.h" #include "Radar Screen.h" @@ -28,7 +27,6 @@ #include "Interface Control.h" #include "Game Clock.h" #include "Map Screen Interface Map Inventory.h" - #include "environment.h" #include "meanwhile.h" #include "strategicmap.h" #include "Animation Data.h" @@ -961,4 +959,4 @@ void TacticalSquadListBtnCallBack(MOUSE_REGION * pRegion, INT32 iReason ) } return; -} \ No newline at end of file +} diff --git a/TileEngine/Render Dirty.cpp b/TileEngine/Render Dirty.cpp index 30178ffa..c0c2d60d 100644 --- a/TileEngine/Render Dirty.cpp +++ b/TileEngine/Render Dirty.cpp @@ -15,10 +15,8 @@ #include "Render Dirty.h" #include "sysutil.h" #include "container.h" - #include "wcheck.h" #include "video.h" #include "vobject_blitters.h" - #include "WinFont.h" #include "Font Control.h" #endif diff --git a/TileEngine/Render Fun.cpp b/TileEngine/Render Fun.cpp index 078cfe49..4fa62e70 100644 --- a/TileEngine/Render Fun.cpp +++ b/TileEngine/Render Fun.cpp @@ -10,11 +10,9 @@ #include "input.h" #include "sysutil.h" #include "debug.h" - #include "wcheck.h" #include "worldman.h" #include "jascreens.h" #include "Isometric Utils.h" - #include "Timer Control.h" #include "renderworld.h" #include "fov.h" #include "Fog Of War.h" diff --git a/TileEngine/SmokeEffects.cpp b/TileEngine/SmokeEffects.cpp index f2cd8ec6..74fd4a95 100644 --- a/TileEngine/SmokeEffects.cpp +++ b/TileEngine/SmokeEffects.cpp @@ -5,7 +5,6 @@ #else #include #include - #include "wcheck.h" #include "stdlib.h" #include "debug.h" //#include "soldier control.h" diff --git a/TileEngine/Tile Animation.cpp b/TileEngine/Tile Animation.cpp index 384434fb..9a0bf003 100644 --- a/TileEngine/Tile Animation.cpp +++ b/TileEngine/Tile Animation.cpp @@ -4,12 +4,9 @@ #include "worlddef.h" #include #include -#include "wcheck.h" #include "stdlib.h" -#include "time.h" #include "video.h" #include "debug.h" -#include "smooth.h" #include "worldman.h" #include "lighting.h" #include "renderworld.h" diff --git a/TileEngine/Tile Cache.cpp b/TileEngine/Tile Cache.cpp index 07cba377..fb51f3b8 100644 --- a/TileEngine/Tile Cache.cpp +++ b/TileEngine/Tile Cache.cpp @@ -5,7 +5,6 @@ #else #include #include - #include "wcheck.h" #include "stdlib.h" #include "debug.h" #include "tiledef.h" diff --git a/TileEngine/Tile Surface.cpp b/TileEngine/Tile Surface.cpp index 1872efde..e9630e3c 100644 --- a/TileEngine/Tile Surface.cpp +++ b/TileEngine/Tile Surface.cpp @@ -7,14 +7,10 @@ #include "worlddat.h" #include #include - #include "wcheck.h" #include "stdlib.h" #include "time.h" #include "video.h" #include "debug.h" - #include "smooth.h" - #include "worldman.h" - #include "mousesystem.h" #include "sys globals.h" #include "tiledat.h" #include "Fileman.h" diff --git a/TileEngine/XML_ExplosionData.cpp b/TileEngine/XML_ExplosionData.cpp index bea25dea..6464a761 100644 --- a/TileEngine/XML_ExplosionData.cpp +++ b/TileEngine/XML_ExplosionData.cpp @@ -7,8 +7,6 @@ #include #include #include "explosion control.h" - #include "TopicIDs.h" - #include "TopicOps.h" #include "Debug.h" #include "FileMan.h" #include "Debug Control.h" diff --git a/TileEngine/environment.cpp b/TileEngine/environment.cpp index d969f60b..4402438c 100644 --- a/TileEngine/environment.cpp +++ b/TileEngine/environment.cpp @@ -10,14 +10,12 @@ #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 "Game Events.h" #include "message.h" #include "opplist.h" diff --git a/TileEngine/lighting.cpp b/TileEngine/lighting.cpp index c7783aa6..af00ba65 100644 --- a/TileEngine/lighting.cpp +++ b/TileEngine/lighting.cpp @@ -33,19 +33,12 @@ #include "vobject_blitters.h" #include "debug.h" #include "wcheck.h" - #include "worldman.h" #include "jascreens.h" - #include "edit_sys.h" #include "Isometric Utils.h" #include "line.h" #include "Animation Control.h" #include "Animation Data.h" - #include "Timer Control.h" - #include "Radar Screen.h" - #include "Render Dirty.h" - #include "Font Control.h" #include "Sys Globals.h" - #include "Render Dirty.h" #include "tiledef.h" #include "lighting.h" #include "Structure Internals.h" diff --git a/TileEngine/overhead map.cpp b/TileEngine/overhead map.cpp index 94fb067c..a44c838e 100644 --- a/TileEngine/overhead map.cpp +++ b/TileEngine/overhead map.cpp @@ -7,7 +7,6 @@ #include "sgp.h" #include "vobject.h" #include "tiledef.h" - #include "wcheck.h" #include "utilities.h" #include "worlddef.h" #include "isometric utils.h" @@ -31,7 +30,6 @@ #include "map information.h" #include "Tactical Placement GUI.h" #include "world items.h" - #include "environment.h" #include "message.h" #include "faces.h" #include "Squads.h" diff --git a/TileEngine/renderworld.cpp b/TileEngine/renderworld.cpp index 9e3da6b9..e11369ee 100644 --- a/TileEngine/renderworld.cpp +++ b/TileEngine/renderworld.cpp @@ -19,7 +19,6 @@ #include "wcheck.h" #include "worldman.h" #include "jascreens.h" - #include "edit_sys.h" #include "Isometric Utils.h" #include "line.h" #include "Animation Control.h" @@ -39,7 +38,6 @@ #include "render fun.h" #include "los.h" #include "interactive tiles.h" - #include "interface cursors.h" #include "rotting corpses.h" #include "tile cache.h" #include "tile animation.h" diff --git a/TileEngine/sysutil.cpp b/TileEngine/sysutil.cpp index 568fb8a2..2a9af907 100644 --- a/TileEngine/sysutil.cpp +++ b/TileEngine/sysutil.cpp @@ -2,15 +2,12 @@ #include "TileEngine All.h" #else #include - #include #include #include "sgp.h" #include "himage.h" #include "vsurface.h" - #include "vsurface_private.h" #include "wcheck.h" #include "sysutil.h" - #include "renderworld.h" #endif UINT32 guiBOTTOMPANEL = 0; diff --git a/TileEngine/worlddef.cpp b/TileEngine/worlddef.cpp index 87f26158..a7c68e30 100644 --- a/TileEngine/worlddef.cpp +++ b/TileEngine/worlddef.cpp @@ -13,7 +13,6 @@ #include "time.h" #include "video.h" #include "debug.h" - #include "smooth.h" #include "worldman.h" #include "mousesystem.h" #include "sys globals.h" @@ -28,7 +27,6 @@ #include "Interactive Tiles.h" #include "utilities.h" #include "overhead.h" - #include "points.h" #include "Event Pump.h" #include "Handle UI.h" #include "opplist.h" @@ -50,7 +48,6 @@ #include "pathai.h" #include "EditorBuildings.h" #include "FileMan.h" - #include "music control.h" #include "Map Edgepoints.h" #include "environment.h" #include "Shade Table Util.h" diff --git a/TileEngine/worldman.cpp b/TileEngine/worldman.cpp index dfc9b7ed..b45e50e0 100644 --- a/TileEngine/worldman.cpp +++ b/TileEngine/worldman.cpp @@ -6,22 +6,18 @@ #include #include "wcheck.h" #include "stdlib.h" - #include "time.h" #include "video.h" #include "debug.h" - #include "smooth.h" #include "worldman.h" #include "lighting.h" #include "renderworld.h" #include "overhead.h" #include "ai.h" - #include "Sound Control.h" #include "animation control.h" #include "isometric utils.h" #include "Font Control.h" #include "message.h" #include "tile cache.h" - #include "Smoothing Utils.h" #include "SaveLoadMap.h" #include "random.h" #include "render fun.h" diff --git a/Utils/Cinematics Bink.cpp b/Utils/Cinematics Bink.cpp index 05f6d3f3..2e17d1a2 100644 --- a/Utils/Cinematics Bink.cpp +++ b/Utils/Cinematics Bink.cpp @@ -4,7 +4,6 @@ #include #include #include -#include #include #include #include @@ -28,7 +27,6 @@ #include -#include "radmalw.i" #include diff --git a/Utils/Cinematics.cpp b/Utils/Cinematics.cpp index cd98d22a..a72cfab5 100644 --- a/Utils/Cinematics.cpp +++ b/Utils/Cinematics.cpp @@ -17,7 +17,6 @@ #include #include #include -#include #include #include #include @@ -41,10 +40,8 @@ #include "vsurface_private.h" -#include "Intro.h" -#include "radmalw.i" #include diff --git a/Utils/Event Manager.cpp b/Utils/Event Manager.cpp index 320a8c35..1de04b5f 100644 --- a/Utils/Event Manager.cpp +++ b/Utils/Event Manager.cpp @@ -2,7 +2,6 @@ #include "Utils All.h" #else #include - #include #include #include "sgp.h" #include "container.h" diff --git a/Utils/Event Pump.cpp b/Utils/Event Pump.cpp index 19b8de00..aa25312b 100644 --- a/Utils/Event Pump.cpp +++ b/Utils/Event Pump.cpp @@ -2,7 +2,6 @@ #include "Utils All.h" #else #include - #include #include #include "sgp.h" #include "container.h" diff --git a/Utils/Font Control.cpp b/Utils/Font Control.cpp index f7965953..38744f65 100644 --- a/Utils/Font Control.cpp +++ b/Utils/Font Control.cpp @@ -3,15 +3,12 @@ #include "winfont.h" #else #include - #include #include #include "sgp.h" #include "himage.h" #include "vsurface.h" - #include "vsurface_private.h" #include "wcheck.h" #include "Font Control.h" - #include "WinFont.h" #endif INT32 giCurWinFont = 0; diff --git a/Utils/MercTextBox.cpp b/Utils/MercTextBox.cpp index 49ea790b..f03b05c7 100644 --- a/Utils/MercTextBox.cpp +++ b/Utils/MercTextBox.cpp @@ -8,7 +8,6 @@ #include "Utilities.h" #include "WordWrap.h" #include "vobject_blitters.h" - #include "Render Dirty.h" #include "Message.h" #endif diff --git a/Utils/Music Control.cpp b/Utils/Music Control.cpp index 2a6693ff..f15021fc 100644 --- a/Utils/Music Control.cpp +++ b/Utils/Music Control.cpp @@ -5,13 +5,10 @@ #include "Music Control.h" #include "soundman.h" #include "Random.h" - #include "gamescreen.h" #include "jascreens.h" - #include "Creature Spreading.h" #include "overhead.h" #include "timer control.h" #include "strategicmap.h" - #include "fade screen.h" #endif //extern int iScreenMode; diff --git a/Utils/Slider.cpp b/Utils/Slider.cpp index 10ff5fbd..817c2edf 100644 --- a/Utils/Slider.cpp +++ b/Utils/Slider.cpp @@ -5,7 +5,6 @@ #include "WordWrap.h" #include "Render Dirty.h" #include "Utilities.h" - #include "Cursors.h" #include "WCheck.h" #include "Slider.h" #include "SysUtil.h" diff --git a/Utils/Text Input.cpp b/Utils/Text Input.cpp index c94d62f4..e8cbb57d 100644 --- a/Utils/Text Input.cpp +++ b/Utils/Text Input.cpp @@ -4,7 +4,6 @@ #include "builddefines.h" #include #include - #include #include #include #include "input.h" @@ -21,7 +20,6 @@ #include "Sound Control.h" #endif -#include STR16 szClipboard; BOOLEAN gfNoScroll = FALSE; @@ -1978,4 +1976,4 @@ void CopyToClipboard( void ) // finish up CloseClipboard(); } -} \ No newline at end of file +} diff --git a/Utils/Text Utils.cpp b/Utils/Text Utils.cpp index a4e0ae4a..f57a0979 100644 --- a/Utils/Text Utils.cpp +++ b/Utils/Text Utils.cpp @@ -1,7 +1,6 @@ #ifdef PRECOMPILEDHEADERS #include "Utils All.h" #else - #include "Language Defines.h" #include "text.h" #include "Fileman.h" #include "GameSettings.h" diff --git a/Utils/Timer Control.cpp b/Utils/Timer Control.cpp index ec91fefc..d0c48b9c 100644 --- a/Utils/Timer Control.cpp +++ b/Utils/Timer Control.cpp @@ -5,7 +5,6 @@ #include #include #include - #include "wcheck.h" #include "stdlib.h" #include "debug.h" #include "Timer Control.h" diff --git a/Utils/XML_Items.cpp b/Utils/XML_Items.cpp index 8fde1754..111d32b1 100644 --- a/Utils/XML_Items.cpp +++ b/Utils/XML_Items.cpp @@ -3,39 +3,31 @@ #else #include "sgp.h" #include "overhead types.h" - #include "Sound Control.h" #include "Soldier Control.h" #include "overhead.h" #include "Event Pump.h" #include "weapons.h" #include "Animation Control.h" - #include "sys globals.h" #include "Handle UI.h" #include "Isometric Utils.h" - #include "worldman.h" #include "math.h" - #include "points.h" #include "ai.h" #include "los.h" #include "renderworld.h" - #include "opplist.h" #include "interface.h" #include "message.h" #include "campaign.h" #include "items.h" #include "text.h" #include "Soldier Profile.h" - #include "tile animation.h" #include "Dialogue Control.h" #include "SkillCheck.h" - #include "explosion control.h" #include "Quests.h" #include "Physics.h" #include "Random.h" #include "Vehicles.h" #include "bullets.h" #include "morale.h" - #include "meanwhile.h" #include "SkillCheck.h" #include "gamesettings.h" #include "SaveLoadMap.h" diff --git a/Utils/XML_Language.cpp b/Utils/XML_Language.cpp index 3adce254..dc787c6c 100644 --- a/Utils/XML_Language.cpp +++ b/Utils/XML_Language.cpp @@ -8,12 +8,10 @@ #include "expat.h" #include "XML.h" #include "Interface.h" - #include "Item Statistics.h" #include "LuaInitNPCs.h" #include "email.h" #include "InterfaceItemImages.h" #include "Soldier Profile.h" - #include "aim.h" #include "mercs.h" #include "Encrypted File.h" #include "GameSettings.h" diff --git a/Utils/dsutil.cpp b/Utils/dsutil.cpp index a1060a88..efa89fb7 100644 --- a/Utils/dsutil.cpp +++ b/Utils/dsutil.cpp @@ -4,13 +4,11 @@ #ifdef PRECOMPILEDHEADERS #include "Utils All.h" #include - #include #include #include #else #include "types.h" #include - #include #include #include #endif diff --git a/Utils/popup_class.cpp b/Utils/popup_class.cpp index 72bc42c0..4b90d183 100644 --- a/Utils/popup_class.cpp +++ b/Utils/popup_class.cpp @@ -1851,4 +1851,4 @@ void popupMouseClickCallback(MOUSE_REGION *pRegion, INT32 iReason) if (p) { p->MenuBtnCallBack(pRegion, iReason); } -} \ No newline at end of file +} diff --git a/aniviewscreen.cpp b/aniviewscreen.cpp index 55b19ef6..602ea063 100644 --- a/aniviewscreen.cpp +++ b/aniviewscreen.cpp @@ -3,15 +3,12 @@ #else #include "builddefines.h" #include - #include #include #include "sgp.h" #include "gameloop.h" #include "himage.h" #include "vobject.h" - #include "vobject_private.h" #include "vobject_blitters.h" - #include "wcheck.h" #include "worlddef.h" #include "renderworld.h" #include "input.h" @@ -19,18 +16,14 @@ #include "screenids.h" #include "container.h" #include "overhead.h" - #include "Isometric Utils.h" #include "sysutil.h" #include "Font Control.h" - #include "Radar Screen.h" #include "Animation Control.h" #include "Animation Data.h" #include "Event Pump.h" - #include "Timer Control.h" #include "Render Dirty.h" #include "Sys Globals.h" #include "interface.h" - #include "soldier ani.h" #include #include #include "english.h" diff --git a/gameloop.cpp b/gameloop.cpp index 637f3650..8fee341b 100644 --- a/gameloop.cpp +++ b/gameloop.cpp @@ -8,7 +8,6 @@ #include "sgp.h" #include "Gameloop.h" #include "Screens.h" - #include "Wcheck.h" #include "cursors.h" #include "init.h" #include "music control.h" @@ -25,7 +24,6 @@ #include "GameSettings.h" #include "mapscreen.h" #include "Interface Control.h" - #include "fade screen.h" #include "text.h" #include "HelpScreen.h" #include "PreBattle Interface.h" diff --git a/gamescreen.cpp b/gamescreen.cpp index 1d492220..a3446287 100644 --- a/gamescreen.cpp +++ b/gamescreen.cpp @@ -5,12 +5,10 @@ #else #include "builddefines.h" #include - #include #include #include "sgp.h" #include "gameloop.h" #include "vobject.h" - #include "wcheck.h" #include "worlddef.h" #include "renderworld.h" #include "font.h" @@ -36,7 +34,6 @@ #include "renderworld.h" #include "sys globals.h" #include "environment.h" - #include "Music Control.h" #include "bullets.h" #include "Assignments.h" #include "message.h" diff --git a/jascreens.cpp b/jascreens.cpp index 5639d63e..fe1d0fb6 100644 --- a/jascreens.cpp +++ b/jascreens.cpp @@ -3,13 +3,11 @@ #else #include "builddefines.h" #include - #include #include #include "sgp.h" #include "gameloop.h" #include "himage.h" #include "vobject.h" - #include "vobject_private.h" #include "vobject_blitters.h" #include "wcheck.h" #include "input.h" @@ -20,7 +18,6 @@ #include "screens.h" #include "Font Control.h" #include "sysutil.h" - #include "renderworld.h" #include "tiledef.h" #include "worlddef.h" #include "editscreen.h" @@ -34,13 +31,9 @@ #include "render dirty.h" #include "jascreens.h" #include "gameloop.h" - #include "cursors.h" #include "Event Pump.h" - #include "environment.h" #include "animation cache.h" #include "lighting.h" - #include "interface panels.h" - #include "Music Control.h" #include "mainmenuscreen.h" #include "Game Init.h" #include "init.h" @@ -53,9 +46,7 @@ #include "Random.h" #include "WordWrap.h" #include "Sound Control.h" - #include "fade screen.h" #include "WordWrap.h" - #include "Multi Language Graphic Utils.h" #include "text.h" #include "Language Defines.h" #include "IniReader.h" diff --git a/legion cfg.cpp b/legion cfg.cpp index ed93e71a..a0bbc5a7 100644 --- a/legion cfg.cpp +++ b/legion cfg.cpp @@ -20,7 +20,6 @@ #else #include "Types.h" #include "types.h" - #include "Campaign Init.h" #include "Random.h" #include "Campaign Types.h" #include "Queen Command.h" @@ -28,11 +27,9 @@ #include "Strategic Movement.h" #include "Strategic Status.h" #include "GameSettings.h" - #include "Creature Spreading.h" #include "Strategic AI.h" #include "XML.h" #include "INIReader.h" - #include "Game init.h" #include "Game Event Hook.h" #include "sgp.h" #include "jascreens.h" @@ -40,23 +37,15 @@ #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" #include "strategicmap.h" #include "game init.h" #include "animation data.h" - #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" #include "Squads.h" - #include "Campaign Init.h" #include "Strategic Town Loyalty.h" #include "Strategic Mines.h" #include "gameloop.h" @@ -67,15 +56,9 @@ #include "Message.h" #include "Game Event Hook.h" #include "Strategic Movement.h" - #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 "INIReader.h" #include "Soldier Profile.h" @@ -96,9 +79,7 @@ #include "Interface.h" #include "Map Screen Interface Map.h" #include "renderworld.h" -#include "aim.h" #include "connect.h" -#include "expat.h" #include "XMLWriter.h" #include "Debug Control.h" #include @@ -313,4 +294,4 @@ void LoadGameLegionOptions() gGameLegionOptions.LaptopLinkFuneral = iniReader.ReadBoolean("Laptop Settings","LINK_FUNERAL", TRUE); gGameLegionOptions.LaptopLinkBobby = iniReader.ReadBoolean("Laptop Settings","LINK_BOBBY", FALSE); gGameLegionOptions.fBobbyRSite = iniReader.ReadBoolean("Laptop Settings","BOBBY_SITE_ACCESSED", FALSE); -} \ No newline at end of file +} diff --git a/ub_config.cpp b/ub_config.cpp index 57e87e80..46701d44 100644 --- a/ub_config.cpp +++ b/ub_config.cpp @@ -18,7 +18,6 @@ #else #include "Types.h" #include "types.h" - #include "Campaign Init.h" #include "Random.h" #include "Campaign Types.h" #include "Queen Command.h" @@ -26,11 +25,9 @@ #include "Strategic Movement.h" #include "Strategic Status.h" #include "GameSettings.h" - #include "Creature Spreading.h" #include "Strategic AI.h" #include "XML.h" #include "INIReader.h" - #include "Game init.h" #include "Game Event Hook.h" #include "sgp.h" #include "jascreens.h" @@ -38,23 +35,15 @@ #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" #include "strategicmap.h" #include "game init.h" #include "animation data.h" - #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" #include "Squads.h" - #include "Campaign Init.h" #include "Strategic Town Loyalty.h" #include "Strategic Mines.h" #include "gameloop.h" @@ -65,15 +54,9 @@ #include "Message.h" #include "Game Event Hook.h" #include "Strategic Movement.h" - #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 "INIReader.h" #include "Soldier Profile.h" @@ -94,9 +77,7 @@ #include "Interface.h" #include "Map Screen Interface Map.h" #include "renderworld.h" -#include "aim.h" #include "connect.h" -#include "expat.h" #include "XMLWriter.h" #include "Debug Control.h" #include @@ -309,4 +290,4 @@ void LoadGameUBOptions() gGameUBOptions.LaptopLinkFuneral = iniReader.ReadBoolean("Laptop Settings","LINK_FUNERAL", TRUE); gGameUBOptions.LaptopLinkBobby = iniReader.ReadBoolean("Laptop Settings","LINK_BOBBY", FALSE); gGameUBOptions.fBobbyRSite = iniReader.ReadBoolean("Laptop Settings","BOBBY_SITE_ACCESSED", FALSE); -} \ No newline at end of file +}