From b6e276ac348429c378bc1332ebceb68fdc709c7c Mon Sep 17 00:00:00 2001 From: Asdow <20314541+Asdow@users.noreply.github.com> Date: Sun, 23 Nov 2025 13:46:50 +0200 Subject: [PATCH] Formatting & whitespace --- Ja2/SaveLoadGame.cpp | 217 ++++++++++++++++++++----------------------- 1 file changed, 101 insertions(+), 116 deletions(-) diff --git a/Ja2/SaveLoadGame.cpp b/Ja2/SaveLoadGame.cpp index 50827274..5775ef24 100644 --- a/Ja2/SaveLoadGame.cpp +++ b/Ja2/SaveLoadGame.cpp @@ -1,123 +1,109 @@ - #include "types.h" - #include "Soldier Profile.h" - #include "FileMan.h" - #include - #include - #include "DEBUG.H" - #include "Overhead.h" - #include "Keys.h" - #include "finances.h" - #include "history.h" - #include "files.h" - #include "laptop.h" - #include "email.h" - #include "strategicmap.h" - #include "Game Events.h" - #include "Game Clock.h" - #include "Soldier Create.h" - #include "worlddef.h" - #include "LaptopSave.h" - #include "Queen Command.h" - #include "SaveLoadGame.h" - #include "Tactical Save.h" - #include "Squads.h" - #include "environment.h" - #include "lighting.h" - #include "Strategic Movement.h" - #include "strategic.h" - #include "Isometric Utils.h" - #include "Quests.h" - #include "opplist.h" - #include "message.h" - #include "NPC.h" - #include "Merc Hiring.h" - #include "SaveLoadScreen.h" - #include "GameVersion.h" - #include "GameSettings.h" - #include "Music Control.h" - #include "Options Screen.h" - #include "ai.h" - #include "renderworld.h" - #include "SmokeEffects.h" - #include "random.h" - #include "Map Screen Interface.h" - #include "Map Screen Interface Border.h" - #include "Map Screen Interface Bottom.h" - - #include "Interface.h" - #include "Map Screen Helicopter.h" - #include "Arms Dealer Init.h" - #include "Tactical Placement GUI.h" - - #include "Strategic Mines.h" - #include "Strategic Town Loyalty.h" - #include "Vehicles.h" - #include "Merc Contract.h" - #include "Bullets.h" - #include "Air Raid.h" - #include "physics.h" - #include "Strategic Pathing.h" - - #include "TeamTurns.h" - - #include "Explosion Control.h" - #include "Creature Spreading.h" - #include "Strategic Status.h" - #include "PreBattle Interface.h" - #include "Boxing.h" - #include "Strategic AI.h" - #include "Map Screen Interface Map.h" - - #include "Meanwhile.h" - #include "Dialogue Control.h" - #include "Text.h" - #include "LightEffects.h" - #include "HelpScreen.h" - #include "Animated ProgressBar.h" - #include "MercTextBox.h" - #include "Render Dirty.h" - #include "Map Information.h" - #include "Interface Items.h" - #include "Civ Quotes.h" - #include "Scheduling.h" - #include "Animation Data.h" - #include "Game Init.h" - #include "Cheats.h" - #include "Strategic Event Handler.h" - #include "Interface Panels.h" - #include "interface Dialogue.h" - #include "Assignments.h" - #include "ShopKeeper Interface.h" - #include "PostalService.h" - // HEADROCK HAM B1: Additional Include for HAM - #include "MilitiaSquads.h" - // HEADROCK HAM 3.5: Another include for HAM - #include "Facilities.h" - // HEADROCK HAM 3.6: Yet another include, goddammit - #include "Town Militia.h" - #include "Items.h" - #include "Encyclopedia_new.h" - #include "CampaignStats.h" // added by Flugente - #include "DynamicDialogue.h" // added by Flugente - #include "PMC.h" // added by Flugente - #include "ASD.h" // added by Flugente - #include "MilitiaIndividual.h" // added by Flugente - #include "Rebel Command.h" - -#include "BobbyR.h" -#include "IMP Portraits.h" -#include "Loading Screen.h" -#include "Interface Utils.h" +#include "types.h" +#include "Soldier Profile.h" +#include "FileMan.h" +#include +#include +#include "DEBUG.H" +#include "Overhead.h" +#include "Keys.h" +#include "finances.h" +#include "history.h" +#include "files.h" +#include "laptop.h" +#include "email.h" +#include "strategicmap.h" +#include "Game Events.h" +#include "Game Clock.h" +#include "Soldier Create.h" +#include "worlddef.h" +#include "LaptopSave.h" +#include "Queen Command.h" +#include "SaveLoadGame.h" +#include "Tactical Save.h" +#include "Squads.h" +#include "environment.h" +#include "lighting.h" +#include "Strategic Movement.h" +#include "strategic.h" +#include "Isometric Utils.h" +#include "Quests.h" +#include "opplist.h" +#include "message.h" +#include "NPC.h" +#include "Merc Hiring.h" +#include "SaveLoadScreen.h" +#include "GameVersion.h" +#include "GameSettings.h" +#include "Music Control.h" +#include "Options Screen.h" +#include "ai.h" +#include "renderworld.h" +#include "SmokeEffects.h" +#include "random.h" +#include "Map Screen Interface.h" +#include "Map Screen Interface Border.h" +#include "Map Screen Interface Bottom.h" +#include "Interface.h" +#include "Map Screen Helicopter.h" +#include "Arms Dealer Init.h" +#include "Tactical Placement GUI.h" +#include "Strategic Mines.h" +#include "Strategic Town Loyalty.h" +#include "Vehicles.h" +#include "Merc Contract.h" +#include "Bullets.h" +#include "Air Raid.h" +#include "physics.h" +#include "Strategic Pathing.h" +#include "TeamTurns.h" +#include "Explosion Control.h" +#include "Creature Spreading.h" +#include "Strategic Status.h" +#include "PreBattle Interface.h" +#include "Boxing.h" +#include "Strategic AI.h" +#include "Map Screen Interface Map.h" +#include "Meanwhile.h" +#include "Dialogue Control.h" +#include "Text.h" +#include "LightEffects.h" +#include "HelpScreen.h" +#include "Animated ProgressBar.h" +#include "MercTextBox.h" +#include "Render Dirty.h" +#include "Map Information.h" +#include "Interface Items.h" +#include "Civ Quotes.h" +#include "Scheduling.h" +#include "Animation Data.h" +#include "Game Init.h" +#include "Cheats.h" +#include "Strategic Event Handler.h" +#include "Interface Panels.h" +#include "interface Dialogue.h" +#include "Assignments.h" +#include "ShopKeeper Interface.h" +#include "PostalService.h" +#include "MilitiaSquads.h" +#include "Facilities.h" +#include "Town Militia.h" +#include "Items.h" +#include "Encyclopedia_new.h" +#include "CampaignStats.h" // added by Flugente +#include "DynamicDialogue.h" // added by Flugente +#include "PMC.h" // added by Flugente +#include "ASD.h" // added by Flugente +#include "MilitiaIndividual.h" // added by Flugente +#include "Rebel Command.h" +#include "BobbyR.h" +#include "IMP Portraits.h" +#include "Loading Screen.h" +#include "Interface Utils.h" #include "Enemy Soldier Save.h" #include "BobbyRMailOrder.h" #include "mercs.h" - #include "LuaInitNPCs.h" #include "BriefingRoom_Data.h" - -//rain -//end rain - #include "connect.h" #include "Map Screen Interface Map Inventory.h"//dnl ch51 081009 #include "Ambient Control.h" // added by Flugente for HandleNewSectorAmbience(...) @@ -126,7 +112,6 @@ // Local Defines // ///////////////////////////////////////////////////// - #ifdef JA2UB #include "Ja25 Strategic Ai.h" #include "Ja25_Tactical.h"