Merge branch 'master' into ExtraMercs

Strategic/AI Viewer.cpp

@@ -15,13 +15,13 @@
 	#include "Text Input.h"
 	#include "mousesystem.h"
 	#include "strategicmap.h"
-	#include "Fileman.h"
+	#include "FileMan.h"
 	#include "Map Information.h"
-	#include "render dirty.h"
+	#include "Render Dirty.h"
 	#include "Game Clock.h"
 	#include "Campaign Types.h"
 	#include "Queen Command.h"
-	#include "overhead.h"
+	#include "Overhead.h"
 	#include "Strategic Movement.h"
 	#include "GameSettings.h"
 	#include "Game Event Hook.h"
@@ -32,7 +32,7 @@
 	#include "Campaign.h"
 	#include "Auto Resolve.h"
 	#include "Strategic Status.h"
-	#include "wordwrap.h"
+	#include "WordWrap.h"
 	#include "Town Militia.h"	// added by Flugente
 
 #ifdef JA2BETAVERSION

Strategic/ASD.cpp

@@ -10,7 +10,7 @@
 #include "Utilities.h"
 #include "WordWrap.h"
 #include "Cursors.h"
-#include "Line.h"
+#include "line.h"
 #include "Insurance Text.h"
 #include "Encrypted File.h"
 #include "Text.h"
@@ -27,10 +27,10 @@
 #include "GameVersion.h"
 #include "message.h"
 #include "Game Event Hook.h"
-#include "militia control.h"
+#include "Militia Control.h"
 #include "Town Militia.h"
 #include "Strategic Town Loyalty.h"
-#include "map information.h"
+#include "Map Information.h"
 
 #include "Campaign.h"
 #include "random.h"

Strategic/ASD.h

@@ -6,7 +6,7 @@
 * @author Flugente (bears-pit.com)
 */
 
-#include "Types.h"
+#include "types.h"
 
 /** Flugente: Arulco special division decision code
  *

Strategic/Assignments.cpp

@@ -1,22 +1,22 @@
 	#include "Assignments.h"
-	#include "Strategic.h"
+	#include "strategic.h"
 	#include "Items.h"
 	#include "Overhead.h"
 	#include "Game Clock.h"
 	#include "stdlib.h"
-	#include "Message.h"
+	#include "message.h"
 	#include "Font Control.h"
 	#include "Map Screen Interface.h"
-	#include "Soldier Profile Type.h"
+	#include "soldier profile type.h"
 	#include "Soldier Profile.h"
 	#include "Campaign.h"
 	#include "Queen Command.h"
 	#include "strategicmap.h"
 	#include "Text.h"
-	#include "dialogue control.h"
+	#include "Dialogue Control.h"
 	#include "NPC.h"
 	#include "Strategic Town Loyalty.h"
-	#include "animation control.h"
+	#include "Animation Control.h"
 	#include "mapscreen.h"
 	#include "Squads.h"
 	#include "Map Screen Helicopter.h"
@@ -26,20 +26,20 @@
 	#include "Map Screen Interface Map.h"
 	#include "Strategic Movement.h"
 	#include "laptop.h"
-	#include "Finances.h"
+	#include "finances.h"
 	#include "LaptopSave.h"
 	#include "renderworld.h"
 	#include "Interface Control.h"
 	#include "Interface.h"
 	#include "Soldier Find.h"
 	#include "ai.h"
-	#include "utilities.h"
+	#include "Utilities.h"
 	#include "random.h"
 	#include "line.h"
 	#include "Soldier Add.h"
 	#include "GameSettings.h"
 	#include "Isometric Utils.h"
-	#include "Soldier Macros.h"
+	#include "Soldier macros.h"
 	#include "Explosion Control.h"
 	#include "SkillCheck.h"
 	#include "Quests.h"
@@ -54,7 +54,7 @@
 	#include "Strategic Status.h"
 	#include "history.h"
 	#include "Map Screen Interface Map Inventory.h"
-	#include "interface dialogue.h"
+	#include "interface Dialogue.h"
 	// added by SANDRO
 	#include "AIInternals.h"
 	#include "Morale.h"
@@ -18324,7 +18324,6 @@ BOOLEAN HandleSelectedMercsBeingPutAsleep( BOOLEAN fWakeUp, BOOLEAN fDisplayWarn
 	INT32 iCounter = 0;
 	SOLDIERTYPE *pSoldier = NULL;
 	UINT8 ubNumberOfSelectedSoldiers = 0;
-	CHAR16 sString[ 128 ];
 	
 	for( iCounter = 0; iCounter < giMAXIMUM_NUMBER_OF_PLAYER_SLOTS; ++iCounter )
 	{
@@ -18379,27 +18378,10 @@ BOOLEAN HandleSelectedMercsBeingPutAsleep( BOOLEAN fWakeUp, BOOLEAN fDisplayWarn
 		}
 	}
 
-	// if there was anyone processed, check for success and inform player of failure
-	if( ubNumberOfSelectedSoldiers )
+	if( ubNumberOfSelectedSoldiers && !fSuccess && fDisplayWarning )
 	{
-		if( fSuccess == FALSE )
-		{
-			if( fWakeUp )
-			{
-				// inform player not everyone could be woke up
-				swprintf( sString, pMapErrorString[ 27 ] );
-			}
-			else
-			{
-				// inform player not everyone could be put to sleep
-				swprintf( sString, pMapErrorString[ 26 ]);
-			}
-
-			if( fDisplayWarning )
-			{
-				DoScreenIndependantMessageBox( sString, MSG_BOX_FLAG_OK, NULL);
-			}
-		}
+		// inform player not everyone could be woke up or put to sleep
+		DoScreenIndependantMessageBox(fWakeUp ? pMapErrorString[27] : pMapErrorString[26], MSG_BOX_FLAG_OK, NULL);
 	}
 
 	return( fSuccess );

Strategic/Assignments.h

@@ -3,7 +3,7 @@
 
 // header for assignment manipulation/updating for characters
 
-#include "Types.h"
+#include "types.h"
 #include "Soldier Control.h"
 #include "mousesystem.h"
 #include "Strategic Movement.h"
@@ -11,27 +11,27 @@
 
 // this distinguishes whether we're only looking for patients healable THIS HOUR (those that have been on their assignment
 // long enough), or those that will be healable EVER (regardless of whether they're getting healed during this hour)
-#define HEALABLE_EVER				0
-#define HEALABLE_THIS_HOUR	1
+constexpr auto HEALABLE_EVER = 0;
+constexpr auto HEALABLE_THIS_HOUR = 1;
 
 
 // merc collapses from fatigue if max breath drops to this.	Can't go any lower!
-#define BREATHMAX_ABSOLUTE_MINIMUM	10
-#define BREATHMAX_GOTTA_STOP_MOVING	30
-#define BREATHMAX_PRETTY_TIRED			50
-#define BREATHMAX_CANCEL_COLLAPSE		60
-#define BREATHMAX_CANCEL_TIRED			75
-#define BREATHMAX_FULLY_RESTED			95
+constexpr auto BREATHMAX_ABSOLUTE_MINIMUM = 10;
+constexpr auto BREATHMAX_GOTTA_STOP_MOVING = 30;
+constexpr auto BREATHMAX_PRETTY_TIRED = 50;
+constexpr auto BREATHMAX_CANCEL_COLLAPSE = 60;
+constexpr auto BREATHMAX_CANCEL_TIRED = 75;
+constexpr auto BREATHMAX_FULLY_RESTED = 95;
 
 
-#define	VEHICLE_REPAIR_POINTS_DIVISOR		10
+constexpr auto VEHICLE_REPAIR_POINTS_DIVISOR = 10;
 
 // controls how easily SAM sites are repaired
 // NOTE: A repairman must generate a least this many points / hour to be ABLE to repair a SAM site at all!
-#define SAM_SITE_REPAIR_DIVISOR		4			// Flugente: changed from 10 to 4
+constexpr auto SAM_SITE_REPAIR_DIVISOR = 4;			// Flugente: changed from 10 to 4;
 
 // minimum condition at which a destroyed SAM site controller is visible in tactical again
-#define MIN_CONDITION_SHOW_SAM_CONTROLLER 20
+constexpr auto MIN_CONDITION_SHOW_SAM_CONTROLLER = 20;
 
 // Assignments Defines
 enum
@@ -124,42 +124,45 @@ enum
 	NUM_ASSIGNMENTS,
 };
 
-#define IS_DOCTOR(assignment) ((assignment == DOCTOR) || (assignment == FACILITY_DOCTOR))
+constexpr auto IS_DOCTOR(int a) -> bool { return a == DOCTOR || a == FACILITY_DOCTOR; };
+
+// Does not include HOSPITAL since mercs are not responsible for their care
+constexpr auto IS_PATIENT(int a) -> bool { return IS_DOCTOR(a) || a == PATIENT || a == FACILITY_PATIENT; };
+
+constexpr auto IS_REPAIR(int a) -> bool { return a == REPAIR || a == FACILITY_REPAIR; };
+constexpr auto SPY_LOCATION(int a) -> bool { return a == CONCEALED || a == GATHERINTEL; };
+
+// Flugente: does this assignment benefit from other mercs being on administration assignment?
+constexpr auto ADMINISTRATION_BONUS(int a) -> bool {
+	return IS_DOCTOR(a)
+		|| IS_REPAIR(a)
+		|| a == TRAIN_SELF
+		|| a == TRAIN_TOWN
+		|| a == TRAIN_TEAMMATE
+		|| a == TRAIN_BY_OTHER
+		|| a == MOVE_EQUIPMENT
+		|| a == FACILITY_STAFF
+		|| a == FACILITY_INTERROGATE_PRISONERS
+		|| a == FACILITY_SPREAD_PROPAGANDA
+		|| a == FACILITY_SPREAD_PROPAGANDA_GLOBAL
+		|| a == FACILITY_STRATEGIC_MILITIA_MOVEMENT
+		|| a == DISEASE_DIAGNOSE
+		|| a == DISEASE_DOCTOR_SECTOR
+		|| a == FORTIFICATION
+		|| a == TRAIN_WORKERS
+		|| a == DOCTOR_MILITIA
+		|| a == DRILL_MILITIA
+		|| a == BURIAL;
+};
+
 // left the last : off so syntax is visually consistent with non-macro case statements
 #define CASE_DOCTOR case DOCTOR: case FACILITY_DOCTOR
 
-// Does not include HOSPITAL since mercs are not responsible for their care
-#define IS_PATIENT(assignment) ((assignment == DOCTOR) || (assignment == PATIENT) || (assignment == FACILITY_DOCTOR) || (assignment == FACILITY_PATIENT))
 // Does not include DOCTOR types because switch cases must be unique
 #define CASE_PATIENT case PATIENT: case FACILITY_PATIENT
 
-#define IS_REPAIR(assignment) ((assignment == REPAIR) || (assignment == FACILITY_REPAIR))
 #define CASE_REPAIR case REPAIR: case FACILITY_REPAIR
 
-#define SPY_LOCATION(assignment) ((assignment == CONCEALED) || (assignment == GATHERINTEL) )
-
-// Flugente: does this assignment benefit from other mercs being on administration assignment?
-#define ADMINISTRATION_BONUS(assignment)	(   IS_DOCTOR(assignment) || \
-											    IS_REPAIR(assignment) || \
-											    (assignment==TRAIN_SELF) || \
-											    (assignment==TRAIN_TOWN) || \
-												(assignment==TRAIN_TEAMMATE) || \
-												(assignment==TRAIN_BY_OTHER) || \
-												(assignment==MOVE_EQUIPMENT) || \
-												(assignment==FACILITY_STAFF) || \
-												(assignment==FACILITY_INTERROGATE_PRISONERS) || \
-												(assignment==FACILITY_SPREAD_PROPAGANDA) || \
-												(assignment==FACILITY_SPREAD_PROPAGANDA_GLOBAL) || \
-												(assignment==FACILITY_STRATEGIC_MILITIA_MOVEMENT) || \
-												(assignment==DISEASE_DIAGNOSE) || \
-												(assignment==DISEASE_DOCTOR_SECTOR) || \
-												(assignment==FORTIFICATION) || \
-												(assignment==TRAIN_WORKERS) || \
-												(assignment==DOCTOR_MILITIA) || \
-												(assignment==DRILL_MILITIA) || \
-												(assignment==BURIAL) \
-											)
-
 // strings for snitch exposition
 enum
 {
@@ -188,7 +191,7 @@ enum
 	NUM_SNITCH_GATHERING_RUMOURS_RESULT,
 };
 
-#define NO_ASSIGNMENT		127 //used when no pSoldier->ubDesiredSquad
+constexpr auto NO_ASSIGNMENT = 127; //used when no pSoldier->ubDesiredSquad;
 
 // Train stats defines (must match ATTRIB_MENU_ defines, and pAttributeMenuStrings )
 enum
@@ -271,14 +274,14 @@ BOOLEAN CanCharacterBeAwakened( SOLDIERTYPE *pSoldier, BOOLEAN fExplainWhyNot );
 // put character in vehicle?
 BOOLEAN CanCharacterVehicle( SOLDIERTYPE *pCharacter );
 
-#define CHARACTER_CANT_JOIN_SQUAD_ALREADY_IN_IT -6
-#define CHARACTER_CANT_JOIN_SQUAD_SQUAD_MOVING -5
-#define CHARACTER_CANT_JOIN_SQUAD_MOVING -4
-#define CHARACTER_CANT_JOIN_SQUAD_VEHICLE -3
-#define CHARACTER_CANT_JOIN_SQUAD_TOO_FAR -2
-#define CHARACTER_CANT_JOIN_SQUAD_FULL -1
-#define CHARACTER_CANT_JOIN_SQUAD 0
-#define CHARACTER_CAN_JOIN_SQUAD 1
+constexpr auto CHARACTER_CANT_JOIN_SQUAD_ALREADY_IN_IT = -6;
+constexpr auto CHARACTER_CANT_JOIN_SQUAD_SQUAD_MOVING = -5;
+constexpr auto CHARACTER_CANT_JOIN_SQUAD_MOVING = -4;
+constexpr auto CHARACTER_CANT_JOIN_SQUAD_VEHICLE = -3;
+constexpr auto CHARACTER_CANT_JOIN_SQUAD_TOO_FAR = -2;
+constexpr auto CHARACTER_CANT_JOIN_SQUAD_FULL = -1;
+constexpr auto CHARACTER_CANT_JOIN_SQUAD = 0;
+constexpr auto CHARACTER_CAN_JOIN_SQUAD = 1;
 
 // can character be added to squad
 INT8 CanCharacterSquad( SOLDIERTYPE *pCharacter, INT8 bSquadValue );

Strategic/Auto Resolve.cpp

@@ -16,8 +16,8 @@
 	#include "video.h"
 	#include "input.h"
 	#include "gamescreen.h"
-	#include "render dirty.h"
-	#include "vObject_Blitters.h"
+	#include "Render Dirty.h"
+	#include "vobject_blitters.h"
 	#include "sysutil.h"
 	#include "Font Control.h"
 	#include "Soldier Create.h"
@@ -32,10 +32,10 @@
 	#include "Tactical Save.h"
 	#include "Strategic Status.h"
 	#include "Map Screen Interface.h"
-	#include "text.h"
+	#include "Text.h"
 	#include "WordWrap.h"
 	#include "Squads.h"
-	#include "Random.h"
+	#include "random.h"
 	#include "line.h"
 	#include "english.h"
 	#include "Strategic Pathing.h"
@@ -48,17 +48,17 @@
 	#include "Strategic AI.h"
 	#include "SkillCheck.h"
 	#include "rt time defines.h"
-	#include "morale.h"
+	#include "Morale.h"
 	#include "Strategic Town Loyalty.h"
 	#include "GameSettings.h"
 	#include "Soldier macros.h"
 	#include "strategicmap.h"
 	#include "Quests.h"
-	#include "meanwhile.h"
+	#include "Meanwhile.h"
 	#include "Inventory Choosing.h"
 	#include "Game Event Hook.h"
 	#include "Assignments.h"
-	#include "cheats.h"
+	#include "Cheats.h"
 	#include "Map Information.h"
 	#include "MilitiaSquads.h"
 //	#include "Strategic AI.h"

Strategic/Campaign Init.cpp

@@ -1,10 +1,10 @@
 	#include "ASD.h"		// added by Flugente
 	#include "types.h"
 	#include "Campaign Init.h"
-	#include "Random.h"
+	#include "random.h"
 	#include "Campaign Types.h"
 	#include "Queen Command.h"
-	#include "overhead.h"
+	#include "Overhead.h"
 	#include "Strategic Movement.h"
 	#include "Strategic Status.h"
 	#include "GameSettings.h"

Strategic/Creature Spreading.cpp

@@ -1,12 +1,12 @@
 	#include "types.h"
-	#include "fileman.h"
+	#include "FileMan.h"
 	#include "himage.h"
 	#include "Creature Spreading.h"
 	#include "Campaign Types.h"
 	#include "Strategic Movement.h"
 	#include "Game Event Hook.h"
 	#include "GameSettings.h"
-	#include "Random.h"
+	#include "random.h"
 	#include "message.h"
 	#include "Font Control.h"
 	#include "Soldier Init List.h"
@@ -23,7 +23,7 @@
 	#include "Map Edgepoints.h"
 	#include "Animation Data.h"
 	#include "opplist.h"
-	#include "meanwhile.h"
+	#include "Meanwhile.h"
 	#include "Strategic AI.h"
 	#include "MessageBoxScreen.h"
 	#include "Map Information.h"

Strategic/Facilities.cpp

@@ -21,7 +21,7 @@
 	#include "Strategic Town Loyalty.h"
 	#include "Strategic Mines.h"
 	#include "SkillCheck.h"
-	#include "Random.h"
+	#include "random.h"
 	#include "strategicmap.h"
 	#include "Game Clock.h"
 	#include "Campaign.h"

Strategic/Facilities.h

@@ -1,7 +1,7 @@
 #ifndef _FACILITIES_H
 #define _FACILITIES_H
 
-#include "campaign types.h"
+#include "Campaign Types.h"
 #include "Soldier Control.h"
 
 // Get a specific modifier for a specific assignment at a specific facility. Includes Ambient (non-assignment based) 

Strategic/Game Clock.cpp

@@ -1,17 +1,17 @@
 	#include "sgp.h"
 	#include "Game Clock.h"
 	#include "Font.h"
-	#include "render dirty.h"
+	#include "Render Dirty.h"
 	#include "Timer Control.h"
-	#include "overhead.h"
+	#include "Overhead.h"
 	#include "environment.h"
 	#include "Game Clock.h"
 	#include "message.h"
 	#include "Game Events.h"
-	#include "assignments.h"
+	#include "Assignments.h"
 	#include "MercTextBox.h"
-	#include "Renderworld.h"
-	#include "Lighting.h"
+	#include "renderworld.h"
+	#include "lighting.h"
 	#include "Map Screen Interface.h"
 	#include "PreBattle Interface.h"
 	#include "Event Pump.h"
@@ -45,6 +45,9 @@ BOOLEAN fClockMouseRegionCreated = FALSE;
 
 BOOLEAN fTimeCompressHasOccured = FALSE;
 
+// run time compression till next hour
+bool stopTimeCompressionNextHour = false;
+
 //This value represents the time that the sector was loaded.	If you are in sector A9, and leave
 //the game clock at that moment will get saved into the temp file associated with it.	The next time you
 //enter A9, this value will contain that time.	Used for scheduling purposes.
@@ -525,6 +528,9 @@ void SetGameTimeCompressionLevel( UINT32 uiCompressionRate )
 {
 	Assert( uiCompressionRate < NUM_TIME_COMPRESS_SPEEDS );
 
+	if( uiCompressionRate == TIME_COMPRESS_X0 )
+		stopTimeCompressionNextHour = false;
+
 	if( guiCurrentScreen == GAME_SCREEN )
 	{
 		if( uiCompressionRate != TIME_COMPRESS_X1 )

Strategic/Game Clock.h

@@ -109,6 +109,9 @@ extern INT32 giTimeCompressSpeeds[ NUM_TIME_COMPRESS_SPEEDS ];
 // compress mode now in use
 extern INT32 giTimeCompressMode;
 
+// run time compression till next hour
+extern bool stopTimeCompressionNextHour;
+
 
 enum
 {

Strategic/Game Event Hook.cpp

@@ -12,21 +12,21 @@
 	#include "email.h"
 	#include "Game Clock.h"
 	#include "Merc Hiring.h"
-	#include "Insurance Contract.h"
+	#include "insurance Contract.h"
 	#include "Strategic Merc Handler.h"
 	#include "Strategic Movement.h"
 	#include "Assignments.h"
 	#include "Strategic Mines.h"
 	#include "Strategic Town Loyalty.h"
-	#include "Message.h"
+	#include "message.h"
 	#include "Map Screen Interface.h"
 	#include "Map Screen Helicopter.h"
 	#include "Scheduling.h"
 	#include "Arms Dealer Init.h"
-	#include "Strategic town reputation.h"
-	#include "air raid.h"
-	#include "meanwhile.h"
-	#include "overhead.h"
+	#include "strategic town reputation.h"
+	#include "Air Raid.h"
+	#include "Meanwhile.h"
+	#include "Overhead.h"
 	#include "random.h"
 	#include "Creature Spreading.h"
 	#include "Strategic AI.h"
@@ -35,7 +35,7 @@
 	#include "INIReader.h"
 	#include "GameSettings.h"
 	#include "english.h"
-	#include "Input.h"
+	#include "input.h"
 	#include "Soldier Profile.h"
 	#include "laptop.h"
 	#include "Campaign.h"

Strategic/Game Events.cpp

@@ -4,7 +4,7 @@
 	#include "Game Events.h"
 	#include "Game Clock.h"
 	#include "MemMan.h"
-	#include "Debug.h"
+	#include "DEBUG.H"
 	#include "Font Control.h"
 	#include "message.h"
 	#include "MiniEvents.h"

Strategic/Game Init.cpp

@@ -3,15 +3,15 @@
 	#include "laptop.h"
 	#include "worlddef.h"
 	#include "Soldier Control.h"
-	#include "overhead.h"
+	#include "Overhead.h"
 	#include "email.h"
 	#include "Game Clock.h"
-	#include "soldier profile.h"
+	#include "Soldier Profile.h"
 	#include "strategicmap.h"
-	#include "game init.h"
-	#include "animation data.h"
+	#include "Game Init.h"
+	#include "Animation Data.h"
 	#include "finances.h"
-	#include "soldier create.h"
+	#include "Soldier Create.h"
 	#include "Soldier Init List.h"
 	#include "strategic.h"
 	#include "history.h"
@@ -21,32 +21,32 @@
 	#include "Strategic Town Loyalty.h"
 	#include "Strategic Mines.h"
 	#include "gameloop.h"
-	#include "Random.h"
+	#include "random.h"
 	#include "Map Screen Interface.h"
 	#include "Tactical Save.h"
 	#include "Campaign Types.h"
-	#include "Message.h"
+	#include "message.h"
 	#include "Game Event Hook.h"
 	#include "Strategic Movement.h"
 	#include "Creature Spreading.h"
 	#include "Quests.h"
 	#include "Strategic AI.h"
-	#include "Laptopsave.h"
+	#include "LaptopSave.h"
 	#include "AimMembers.h"
-	#include "dialogue control.h"
-	#include "npc.h"
+	#include "Dialogue Control.h"
+	#include "NPC.h"
 	#include "GameSettings.h"
-	#include "interface dialogue.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 "bobbyr.h"
-	#include "helpscreen.h"
+	#include "BobbyR.h"
+	#include "HelpScreen.h"
 	#include "Air Raid.h"
 	#include "Interface.h"
-	#include "cheats.h"
+	#include "Cheats.h"
 	#include "Interface Panels.h"
 	// HEADROCK HAM 3.6: Include for adding facility debt reset
 	#include "Facilities.h"
@@ -61,7 +61,7 @@
 	#include "World Items.h"
 
 #include "Vehicles.h"
-#include "text.h"
+#include "Text.h"
 #include "connect.h"
 #include "XML.h"
 #include "mercs.h"

Strategic/Hourly Update.cpp

@@ -10,7 +10,7 @@
 	#include "jascreens.h"
 	#include "screenids.h"
 	#include "Items.h"
-	#include "Random.h"
+	#include "random.h"
 	#include "finances.h"
 	#include "history.h"
 	#include "Dialogue Control.h"
@@ -86,6 +86,11 @@ CHAR16	zString[128];
 	if(is_networked)
 		return;
 
+	if (stopTimeCompressionNextHour)
+	{
+		SetGameTimeCompressionLevel( TIME_COMPRESS_X0);
+	}	
+
 	// hourly update of town loyalty
 	HandleTownLoyalty();
 

Strategic/Ja25 Strategic Ai.cpp

@@ -12,61 +12,61 @@
 	#include "jascreens.h"
 	#include "worlddef.h"
 	#include "Soldier Control.h"
-	#include "overhead.h"
-	#include "isometric utils.h"
+	#include "Overhead.h"
+	#include "Isometric Utils.h"
 	#include "worlddef.h"
-	#include "worlddat.h"
-	#include "text.h"
-	#include "Soldier add.h"
-	#include "soldier macros.h"
+	#include "WorldDat.h"
+	#include "Text.h"
+	#include "Soldier Add.h"
+	#include "Soldier macros.h"
 	#include "Strategic Pathing.h"
-	#include "soldier create.h"
-	#include "handle UI.h"
+	#include "Soldier Create.h"
+	#include "Handle UI.h"
 	#include "faces.h"
 	#include "renderworld.h"
 	#include "Map Information.h"
 	#include "Assignments.h"
 	#include "message.h"
 	#include "Game Events.h"
-	#include "quests.h"
+	#include "Quests.h"
 	#include "FileMan.h"
-	#include "animated progressbar.h"
+	#include "Animated ProgressBar.h"
 	#include "Strategic Movement.h"
 	#include "Campaign Types.h"
 	#include "Exit Grids.h"
 	#include "Tactical Save.h"
-	#include "animation control.h"
-	#include "squads.h"
+	#include "Animation Control.h"
+	#include "Squads.h"
 	#include "Overhead.h"
 	#include "Strategic Town Loyalty.h"
 	#include "Queen Command.h"
-	#include "cursor control.h"
+	#include "Cursor Control.h"
 	#include "PreBattle Interface.h"
 	#include "gameloop.h"
-	#include "Random.h"
+	#include "random.h"
 	#include "ai.h"
-	#include "keys.h"
+	#include "Keys.h"
 	#include "Tactical Placement GUI.h"
 	#include "Map Screen Helicopter.h"
 	#include "Player Command.h"
 	#include "Event Pump.h"
-	#include "air raid.h"
+	#include "Air Raid.h"
 	#include "Strategic Mines.h"
 	#include "SaveLoadMap.h"
 	#include "Militia Control.h"
-	#include "gamesettings.h"
+	#include "GameSettings.h"
 	#include "Town Militia.h"
 	#include "sysutil.h"
 	#include "Debug Control.h"
 	#include "Queen Command.h"
 	#include "Strategic Event Handler.h"
 	#include "MessageBoxScreen.h"
-	#include "interface dialogue.h"
+	#include "interface Dialogue.h"
 	#include "Map Screen Interface.h"
 	#include "Bullets.h"
 	#include "physics.h"
 	#include "Auto Resolve.h"
-	#include "cursors.h"
+	#include "Cursors.h"
 
 #ifdef JA2UB
 #include "Soldier Init List.h"

Strategic/LuaInitNPCs.cpp

@@ -42,7 +42,7 @@
 #include "Game Events.h"
 #include "email.h"
 #include "worldman.h"
-#include "text.h"
+#include "Text.h"
 #include "Dialogue Control.h"
 #include "Boxing.h"
 

Strategic/LuaInitNPCs.h

@@ -1,7 +1,7 @@
 #ifndef _LUAINITNPCS_H
 #define _LUAINITNPCS_H
 
-#include "Types.h"
+#include "types.h"
 
 typedef struct
 {

Strategic/Luaglobal.h

@@ -1,7 +1,7 @@
 #ifndef _LUAGLOBAL_H
 #define _LUAGLOBAL_H
 
-#include "Types.h"
+#include "types.h"
 
 extern "C" {
 #include "lua.h"

Strategic/Map Screen Helicopter.cpp

@@ -1,17 +1,17 @@
 	#include "Map Screen Helicopter.h"
 	#include "LaptopSave.h"
 	#include "Vehicles.h"
-	#include "Finances.h"
+	#include "finances.h"
 	#include "Quests.h"
 	#include "Game Clock.h"
 	#include "strategic.h"
 	#include "Queen Command.h"
 	#include "Strategic Pathing.h"
-	#include "Random.h"
+	#include "random.h"
 	#include "Game Event Hook.h"
-	#include "String.h"
+	#include "string.h"
 	#include "Dialogue Control.h"
-	#include "Message.h"
+	#include "message.h"
 	#include "Strategic Movement.h"
 	#include "Soldier Profile.h"
 	#include "Assignments.h"
@@ -19,14 +19,14 @@
 	#include "strategicmap.h"
 	#include "worlddef.h"
 	#include "worldman.h"
-	#include "tiledat.h"
+	#include "TileDat.h"
 	#include "Map Screen Interface.h"
 	#include "Text.h"
 	#include "Squads.h"
 	#include "Player Command.h"
 	#include "Sound Control.h"
 	#include "GameSettings.h"
-	#include "meanwhile.h"
+	#include "Meanwhile.h"
 	#include "Map Screen Interface Border.h"
 	#include "Strategic Event Handler.h"
 	#include "Overhead.h"

Strategic/Map Screen Helicopter.h

@@ -1,7 +1,7 @@
 #ifndef __MAP_SCREEN_HELICOPTER_H
 #define __MAP_SCREEN_HELICOPTER_H
 
-#include "Types.h"
+#include "types.h"
 #include "Soldier Control.h"
 
 // costs of flying through sectors

Strategic/Map Screen Interface Border.cpp

@@ -1,5 +1,5 @@
 	#include "Map Screen Interface Border.h"
-	#include "Types.h"
+	#include "types.h"
 	#include "vsurface.h"
 	#include "mousesystem.h"
 	#include "Button System.h"

Strategic/Map Screen Interface Border.h

@@ -1,7 +1,7 @@
 #ifndef __MAP_INTERFACE_BORDER_H
 #define __MAP_INTERFACE_BORDER_H
 
-#include "Types.h"
+#include "types.h"
 
 //#define	 MAP_BORDER_START_X	261
 //#define	 MAP_BORDER_START_Y	0

Strategic/Map Screen Interface Bottom.cpp

@@ -1,6 +1,6 @@
 	#include "Map Screen Interface Bottom.h"
 	#include "Map Screen Interface Border.h"
-	#include "Types.h"
+	#include "types.h"
 	#include "vsurface.h"
 	#include "mousesystem.h"
 	#include "Button System.h"
@@ -9,16 +9,16 @@
 	#include "message.h"
 	#include "mapscreen.h"
 	#include "strategicmap.h"
-	#include "font control.h"
+	#include "Font Control.h"
 	#include "Radar Screen.h"
-	#include "game clock.h"
+	#include "Game Clock.h"
 	#include "sysutil.h"
 	#include "Render Dirty.h"
 	#include "Map Screen Interface.h"
 	#include "Map Screen Interface Map.h"
 	#include "Text.h"
 	#include "Overhead.h"
-	#include "Prebattle Interface.h"
+	#include "PreBattle Interface.h"
 	#include "Options Screen.h"
 	#include "Cursor Control.h"
 	#include "gameloop.h"
@@ -26,11 +26,11 @@
 	#include "Tactical Save.h"
 	#include "Campaign Types.h"
 	#include "Air Raid.h"
-	#include "Finances.h"
+	#include "finances.h"
 	#include "LaptopSave.h"
 	#include "Interface Items.h"
-	#include "wordwrap.h"
-	#include "meanwhile.h"
+	#include "WordWrap.h"
+	#include "Meanwhile.h"
 	#include "Dialogue Control.h"
 	#include "Map Screen Helicopter.h"
 	#include "Map Screen Interface TownMine Info.h"
@@ -44,7 +44,7 @@
 	#include "SaveLoadScreen.h"
 	#include "Interface Control.h"
 	#include "Sys Globals.h"
-#include "game init.h"
+#include "Game Init.h"
 
 #ifdef JA2UB
 #include "Ja25 Strategic Ai.h"
@@ -713,6 +713,27 @@ void BtnTimeCompressMoreMapScreenCallback( GUI_BUTTON *btn,INT32 reason )
 	{
 		if ( CommonTimeCompressionChecks() == TRUE )
 			return;
+
+		// redraw region
+		if( btn->uiFlags & MSYS_HAS_BACKRECT )
+		{
+			fMapScreenBottomDirty = TRUE;
+		}
+
+		btn->uiFlags|=(BUTTON_CLICKED_ON);
+	}
+	// Start time compression which stops at the next hour
+	// Button down removes the pop up/tooltip, Button up calls the functionality
+	else if(reason & MSYS_CALLBACK_REASON_RBUTTON_UP )
+	{
+		if (btn->uiFlags & BUTTON_CLICKED_ON)
+		{
+			btn->uiFlags&=~(BUTTON_CLICKED_ON);
+			fMapScreenBottomDirty = TRUE;
+
+			stopTimeCompressionNextHour = true;
+			SetGameTimeCompressionLevel( TIME_COMPRESS_60MINS );
+		}
 	}
 }
 

Strategic/Map Screen Interface Map Inventory.cpp

@@ -20,12 +20,12 @@
 	#include "GameSettings.h"
 	#include "Radar Screen.h"
 	#include "message.h"
-	#include "weapons.h"
+	#include "Weapons.h"
 	#include "finances.h"
 	#include "Game Clock.h"
 	#include "Sound Control.h"
-	#include "interface panels.h"
-	#include "wordwrap.h"
+	#include "Interface Panels.h"
+	#include "WordWrap.h"
 	#include "Soldier macros.h"
 	#include "rt time defines.h"
 	#include "Encyclopedia_new.h" //Moa: item visibility

Strategic/Map Screen Interface Map.cpp

@@ -17,7 +17,7 @@
 	#include "WCheck.h"
 	#include "Assignments.h"
 	#include "Squads.h"
-	#include "Message.h"
+	#include "message.h"
 	#include "Soldier Profile.h"
 	#include "Player Command.h"
 	#include "Strategic Movement.h"

Strategic/Map Screen Interface TownMine Info.cpp

@@ -1,6 +1,6 @@
 	#include "Map Screen Interface TownMine Info.h"
 	#include "strategicmap.h"
-	#include "popupbox.h"
+	#include "PopUpBox.h"
 	#include "Map Screen Interface.h"
 	#include "Queen Command.h"
 	#include "Player Command.h"
@@ -15,7 +15,7 @@
 	#include "Strategic Mines.h"
 	#include "finances.h"
 	#include "Map Screen Interface Map Inventory.h"
-	#include "Strategic.h"
+	#include "strategic.h"
 	#include "Utilities.h"
 	#include "video.h"
 	#include "Town Militia.h"
@@ -23,7 +23,7 @@
 	#include "Map Screen Helicopter.h"
 	#include "Tactical Save.h"
 	#include "GameSettings.h"
-	#include "debug.h"
+	#include "DEBUG.H"
 	#include "Overhead.h"	// added by Flugente
 	#include "Game Clock.h"			// added by Flugente
 	#include "Game Event Hook.h"	// added by Flugente

Strategic/Map Screen Interface TownMine Info.h

@@ -1,7 +1,7 @@
 #ifndef __MS_I_TOWNMINE_INFO_H
 #define __MS_I_TOWNMINE_INFO_H
 
-#include "Types.h"
+#include "types.h"
 
 extern BOOLEAN fShowTownInfo; 
 

Strategic/Map Screen Interface.cpp

@@ -8,8 +8,8 @@
 	#include "Overhead.h"
 	#include "Squads.h"
 	#include "Sound Control.h"
-	#include "Soundman.h"
-	#include "Message.h"
+	#include "soundman.h"
+	#include "message.h"
 	#include "PopUpBox.h"
 	#include "Game Clock.h"
 	#include "Handle Items.h"
@@ -19,20 +19,20 @@
 	#include "Game Event Hook.h"
 	#include "Tactical Save.h"
 	#include "Quests.h"
-	#include "Strategicmap.h"
+	#include "strategicmap.h"
 	#include "Soldier Profile.h"
 	#include "Strategic Movement.h"
 	#include "Dialogue Control.h"
 	#include "Map Screen Interface Border.h"
 	#include "Map Screen Interface Bottom.h"
 	#include "Vehicles.h"
-	#include "LINE.H"
+	#include "line.h"
 	#include "Text.h"
 	#include "gameloop.h"
 	#include "Map Screen Helicopter.h"
 	#include "PreBattle Interface.h"
 	#include "WordWrap.h"
-	#include "interface control.h"
+	#include "Interface Control.h"
 	#include "GameSettings.h"
 	#include "Campaign Types.h"
 	#include "Map Screen Interface Map Inventory.h"
@@ -40,7 +40,7 @@
 	#include "Keys.h"
 	#include "Soldier macros.h"
 	#include "Militia Control.h"
-	#include "Random.h"
+	#include "random.h"
 	#include "Cursor Control.h"
 	#include "renderworld.h"
 	#include "Game Init.h"
@@ -51,7 +51,7 @@
 	#include "Queen Command.h"
 	#include "Render Fun.h"
 	#include "Food.h"
-	#include "Personnel.h"
+	#include "personnel.h"
 	#include "mapscreen.h"
 
 #include "connect.h"

Strategic/Map Screen Interface.h

@@ -2,7 +2,7 @@
 #define MAP_SCREEN_INTERFACE_H
 
 
-#include "Types.h"
+#include "types.h"
 #include "Soldier Control.h"
 #include "MessageBoxScreen.h"
 #include "Font Control.h"

Strategic/MapScreen Quotes.cpp

@@ -6,8 +6,8 @@
 	#include "Soldier Control.h"
 	#include "Overhead.h"
 	#include "Squads.h"
-	#include "Soundman.h"
-	#include "Message.h"
+	#include "soundman.h"
+	#include "message.h"
 	#include "PopUpBox.h"
 	#include "Handle Items.h"
 	#include "Interface Items.h"
@@ -16,14 +16,14 @@
 	#include "Game Event Hook.h"
 	#include "Tactical Save.h"
 	#include "Quests.h"
-	#include "Strategicmap.h"
+	#include "strategicmap.h"
 	#include "Soldier Profile.h"
 	#include "Strategic Movement.h"
 	#include "Dialogue Control.h"
 	#include "Map Screen Interface Border.h"
 	#include "Map Screen Interface Bottom.h"
 	#include "Vehicles.h"
-	#include "LINE.H"
+	#include "line.h"
 	#include "Text.h"
 	#include "gameloop.h"
 	#include "Map Screen Helicopter.h"
@@ -36,7 +36,7 @@
 	#include "Keys.h"
 	#include "Soldier macros.h"
 	#include "Militia Control.h"
-	#include "Random.h"
+	#include "random.h"
 	#include "Cursor Control.h"
 	#include "renderworld.h"
 	#include "Strategic Mines.h"

Strategic/Meanwhile.cpp

@@ -1,24 +1,24 @@
 	#include "sgp.h"
-	#include "meanwhile.h"
+	#include "Meanwhile.h"
 	#include "PreBattle Interface.h"
-	#include "messageboxscreen.h"
+	#include "MessageBoxScreen.h"
 	#include "strategicmap.h"
-	#include "fade screen.h"
+	#include "Fade Screen.h"
 	#include "screenids.h"
 	#include "jascreens.h"
-	#include "npc.h"
-	#include "game event hook.h"
-	#include "game clock.h"
-	#include "tactical save.h"
-	#include "soldier profile.h"
-	#include "overhead.h"
-	#include "dialogue control.h"
+	#include "NPC.h"
+	#include "Game Event Hook.h"
+	#include "Game Clock.h"
+	#include "Tactical Save.h"
+	#include "Soldier Profile.h"
+	#include "Overhead.h"
+	#include "Dialogue Control.h"
 	#include "gameloop.h"
-	#include "npc.h"
-	#include "assignments.h"
+	#include "NPC.h"
+	#include "Assignments.h"
 	#include "strategic.h"
-	#include "text.h"
-	#include "interface control.h"
+	#include "Text.h"
+	#include "Interface Control.h"
 	#include "Interface Items.h"
 	#include "Map Information.h"
 	#include "Map Screen Interface Map.h"
@@ -28,11 +28,11 @@
 	#include "Game Events.h"
 	#include "GameSettings.h"
 	#include "Strategic AI.h"
-	#include "interface dialogue.h"
+	#include "interface Dialogue.h"
 	#include "Quests.h"
 	#include "Campaign Types.h"
 	#include "Squads.h"
-	#include "Random.h"
+	#include "random.h"
 
 #include "GameInitOptionsScreen.h"
 

Strategic/Merc Contract.cpp

@@ -1,15 +1,15 @@
 #include "builddefines.h"
 
-	#include "Types.h"
+	#include "types.h"
 	#include "Merc Contract.h"
 	#include "Soldier Profile.h"
-	#include "History.h"
+	#include "history.h"
 	#include "finances.h"
 	#include "Game Clock.h"
 	#include "Soldier Add.h"
 	#include "Dialogue Control.h"
 	#include "Soldier Create.h"
-	#include "Message.h"
+	#include "message.h"
 	#include "Font Control.h"
 	#include "personnel.h"
 	#include "LaptopSave.h"
@@ -23,7 +23,7 @@
 	#include "Interface Control.h"
 	#include "gamescreen.h"
 	#include "jascreens.h"
-	#include "Random.h"
+	#include "random.h"
 	#include "Assignments.h"
 	#include "Strategic Movement.h"
 	#include "Squads.h"
@@ -31,7 +31,7 @@
 	#include "Text.h"
 	#include "Strategic Status.h"
 	#include "mercs.h"
-	#include "insurance contract.h"
+	#include "insurance Contract.h"
 	#include "Vehicles.h"
 	#include "email.h"
 	#include "Map Screen Helicopter.h"

Strategic/MilitiaIndividual.cpp

@@ -6,7 +6,7 @@
 #include "MilitiaIndividual.h"
 
 #include "random.h"
-#include "text.h"
+#include "Text.h"
 #include "Overhead Types.h"
 #include "Game Clock.h"
 #include "strategicmap.h"

Strategic/MilitiaSquads.cpp

@@ -7,13 +7,13 @@
 	#include "Strategic Town Loyalty.h"
 	#include "Utilities.h"
 	#include "random.h"
-	#include "text.h"
+	#include "Text.h"
 	#include "Map Screen Interface.h"
 	#include "Interface.h"
-	#include "Laptopsave.h"
+	#include "LaptopSave.h"
 	#include "Game Clock.h"
 	#include "Assignments.h"
-	#include "squads.h"
+	#include "Squads.h"
 	#include "Soldier Create.h"
 	#include "Dialogue Control.h"
 	#include "GameSettings.h"

Strategic/MilitiaSquads.h

@@ -3,9 +3,9 @@
 
 // header for town militia strategic control module
 
-#include "Types.h"
+#include "types.h"
 #include "Soldier Control.h"
-#include "campaign types.h"
+#include "Campaign Types.h"
 
 //#define MAXIMUM_MILITIA_SQUAD_SIZE 30 
 

Strategic/MiniEvents.h

@@ -3,7 +3,7 @@
 
 #define MINI_EVENT_Z_OFFSET 9
 
-#include "Types.h"
+#include "types.h"
 
 void InitMiniEvents();
 void CheckMiniEvents(UINT32 nextEventId);

Strategic/Player Command.cpp

@@ -1,18 +1,18 @@
 	#include "Player Command.h"
 	#include "Queen Command.h"
 	#include "Campaign Types.h"
-	#include "Strategic.h"
+	#include "strategic.h"
 	#include "Strategic Town Loyalty.h"
 	#include "Strategic Mines.h"
-	#include "text.h"
-	#include "laptopsave.h"
-	#include "quests.h"
+	#include "Text.h"
+	#include "LaptopSave.h"
+	#include "Quests.h"
 	#include "Morale.h"
 	#include "Overhead.h"
 	#include "strategicmap.h"
 	#include "Map Screen Helicopter.h"
 	#include "Game Clock.h"
-	#include "meanwhile.h"
+	#include "Meanwhile.h"
 	#include "email.h"
 	#include "GameSettings.h"
 	#include "Strategic Status.h"
@@ -21,14 +21,14 @@
 	#include "Map Screen Interface.h"
 	#include "Tactical Save.h"
 	#include "interface Dialogue.h"
-	#include "Random.h"
+	#include "random.h"
 	// HEADROCK HAM 3.6: Added for facility string printing...
 	#include "PopUpBox.h"
 	#include "CampaignStats.h"	// added by Flugente
 	#include "Town Militia.h"	// added by Flugente
 	#include "LuaInitNPCs.h"	// added by Flugente
 
-#include "postalservice.h"
+#include "PostalService.h"
 
 #include "GameInitOptionsScreen.h"
 

Strategic/PreBattle Interface.cpp

@@ -14,7 +14,7 @@
 	#include "Queen Command.h"
 	#include "Strategic Movement.h"
 	#include "Strategic Pathing.h"
-	#include "text.h"
+	#include "Text.h"
 	#include "PopUpBox.h"
 	#include "Player Command.h"
 	#include "Cursors.h"
@@ -22,19 +22,19 @@
 	#include "Sound Control.h"
 	#include "english.h"
 	#include "Map Screen Interface Bottom.h"
-	#include "overhead.h"
+	#include "Overhead.h"
 	#include "Tactical Placement GUI.h"
 	#include "Town Militia.h"
-	#include "campaign.h"
+	#include "Campaign.h"
 	#include "GameSettings.h"
-	#include "Random.h"
+	#include "random.h"
 	#include "Creature Spreading.h"
 	#include "Multi Language Graphic Utils.h"
 	#include "Map Screen Helicopter.h"
 	#include "Quests.h"
 	#include "Map Screen Interface Border.h"
 	#include "Strategic Status.h"
-	#include "interface control.h"
+	#include "Interface Control.h"
 	#include "Strategic Town Loyalty.h"
 	#include "Squads.h"
 	#include "Assignments.h"
@@ -45,7 +45,7 @@
 	#include "Tactical Save.h"
 	#include "message.h"
 	#include "CampaignStats.h"				// added by Flugente
-	#include "militiasquads.h"				// added by Flugente
+	#include "MilitiaSquads.h"				// added by Flugente
 	#include "SkillCheck.h"					// added by Flugente
 	#include "Strategic Transport Groups.h"
 	#include "Utilities.h"

Strategic/Queen Command.cpp

@@ -5,8 +5,8 @@
 	#include "Overhead Types.h"
 	#include "strategicmap.h"
 	#include "Soldier Init List.h"
-	#include "debug.h"
-	#include "Random.h"
+	#include "DEBUG.H"
+	#include "random.h"
 	#include "Strategic Movement.h"
 	#include "Overhead.h"
 	#include "Strategic Pathing.h"
@@ -15,10 +15,10 @@
 	#include "Map Edgepoints.h"
 	#include "PreBattle Interface.h"
 	#include "strategic status.h"
-	#include "squads.h"
-	#include "assignments.h"
-	#include "items.h"
-	#include "tactical save.h"
+	#include "Squads.h"
+	#include "Assignments.h"
+	#include "Items.h"
+	#include "Tactical Save.h"
 	#include "Soldier Ani.h"
 	#include "Strategic AI.h"
 	#include "GameSettings.h"
@@ -36,7 +36,7 @@
 	#include "Town Militia.h"
 	#include "Dialogue Control.h"
 	#include "Campaign Init.h"
-	#include "meanwhile.h"
+	#include "Meanwhile.h"
 	#include "Soldier macros.h"
 	#include "Morale.h"
 	#include "CampaignStats.h"		// added by Flugente

Strategic/Quest Debug System.cpp

@@ -1,10 +1,10 @@
 #include "builddefines.h"
 
-	#include	"Types.h"
+	#include	"types.h"
 	#include	"Quest Debug System.h"
 	#include	"WCheck.h"
 	#include	"Font Control.h"
-	#include	"Video.h"
+	#include	"video.h"
 	#include	"Game Clock.h"
 	#include	"Render Dirty.h"
 	#include	"WordWrap.h"
@@ -19,23 +19,23 @@
 	#include	"Text Input.h"
 	#include	"Soldier Create.h"
 	#include	"strategicmap.h"
-	#include	"soldier add.h"
-	#include	"Opplist.h"
+	#include	"Soldier Add.h"
+	#include	"opplist.h"
 	#include	"Handle Items.h"
 	#include	"Game Clock.h"
 	#include	"environment.h"
-	#include	"dialogue control.h"
+	#include	"Dialogue Control.h"
 	//#include	"Soldier Control.h"
-	#include	"overhead.h"
+	#include	"Overhead.h"
 	#include	"MessageBoxScreen.h"
-	#include	"Stdio.h"
+	#include	"stdio.h"
 	#include	"english.h"
 	#include	"line.h"
 	#include	"Keys.h"
-	#include	"Interface Dialogue.h"
-	#include	"SysUtil.h"
-	#include	"Message.h"
-	#include "Random.h"
+	#include	"interface Dialogue.h"
+	#include	"sysutil.h"
+	#include	"message.h"
+	#include "random.h"
 
 //#ifdef JA2BETAVERSION
 

Strategic/Quests.cpp

@@ -1,17 +1,17 @@
 	#include "sgp.h"
 	#include "message.h"
-	#include "quests.h"
-	#include "game clock.h"
-	#include "StrategicMap.h"
-	#include "soldier profile.h"
+	#include "Quests.h"
+	#include "Game Clock.h"
+	#include "strategicmap.h"
+	#include "Soldier Profile.h"
 	#include "LaptopSave.h"
 	#include "Handle Items.h"
-	#include "overhead.h"
-	#include "Interface Dialogue.h"
+	#include "Overhead.h"
+	#include "interface Dialogue.h"
 	#include "Soldier Profile.h"
 	#include "Isometric Utils.h"
 	#include "Render Fun.h"
-	#include "History.h"
+	#include "history.h"
 	#include "Map Screen Helicopter.h"
 	#include "Overhead.h"
 	#include "Strategic Mines.h"
@@ -23,7 +23,7 @@
 	#include "GameSettings.h"
 	#include "Arms Dealer Init.h"
 	#include "GameSettings.h"
-	#include "Random.h"
+	#include "random.h"
 	#include "Assignments.h"
 	#include "strategic.h"
 	#include "Strategic Event Handler.h"

Strategic/Rebel Command.cpp

@@ -75,7 +75,7 @@ Points of interest:
 #include "GameSettings.h"
 #include "GameVersion.h"
 #include "input.h"
-#include "Line.h"
+#include "line.h"
 #include "laptop.h"
 #include "message.h"
 #include "MessageBoxScreen.h"
@@ -129,21 +129,10 @@ namespace ItemIdCache
 {
 	// cache these values on load so that we don't need to search for them every time something happens
 	std::vector<UINT16> gasCans;
-	std::vector<UINT16> firstAidKits;
-	std::vector<UINT16> medKits;
-	std::vector<UINT16> toolKits;
-	std::vector<UINT16> ammo[10]; // coolness
 
 	void Clear()
 	{
 		gasCans.clear();
-		firstAidKits.clear();
-		medKits.clear();
-		toolKits.clear();
-		for (int i = 0; i < 10; ++i)
-		{
-			ammo[i].clear();
-		}
 	}
 }
 
@@ -4418,23 +4407,6 @@ void SetupInfo()
 	for (UINT16 i = 0; i < MAXITEMS; ++i)
 	{
 		if (ItemIsGascan(i)) ItemIdCache::gasCans.push_back(i);
-		else if (ItemIsFirstAidKit(i)) ItemIdCache::firstAidKits.push_back(i);
-		else if (ItemIsMedicalKit(i)) ItemIdCache::medKits.push_back(i);
-		else if (ItemIsToolkit(i)) ItemIdCache::toolKits.push_back(i);
-		else if (Item[i].usItemClass & IC_AMMO)
-		{
-			if (Magazine[Item[i].ubClassIndex].ubMagType == AMMO_BOX)
-			{
-				if ((gGameOptions.fGunNut || !ItemIsOnlyInTonsOfGuns(i))
-				&& (gGameOptions.ubGameStyle == STYLE_SCIFI || !ItemIsOnlyInScifi(i)))
-				{
-					// coolness runs from 1-10, so apply offset
-					const UINT8 coolness = min(max(1, Item[i].ubCoolness), 10);
-					ItemIdCache::ammo[coolness-1].push_back(i);
-				}
-			}
-		}
-		
 	}
 }
 
@@ -4772,8 +4744,10 @@ void ApplyAdditionalASDEffects()
 		{
 		case MissionHelpers::DISRUPT_ASD_STEAL_FUEL:
 		{
-			// spawn a gas can
-			CreateItemAtAirport(ItemIdCache::gasCans.at(ItemIdCache::gasCans.size()), 75 + Random(26));
+			// only spawn a gas can if at least one gas can is known by the game (ItemIsGascan)
+			if (ItemIdCache::gasCans.size() > 0)
+				// The gas can is spawned like a Bobby Ray delivery (you need to open the crate)
+				CreateItemAtAirport(ItemIdCache::gasCans.at(ItemIdCache::gasCans.size() -1), 75 + Random(26));
 
 			// say it came from the ASD's reserves
 			AddStrategicAIResources(ASD_FUEL, -(gGameExternalOptions.gASDResource_Fuel_Jeep + Random(gGameExternalOptions.gASDResource_Fuel_Jeep)));

Strategic/Rebel Command.h

@@ -4,7 +4,7 @@
 #include "CampaignStats.h"
 #include "mapscreen.h"
 #include "Soldier Control.h"
-#include "Types.h"
+#include "types.h"
 
 #define		REBEL_COMMAND_Z_OFFSET						9
 #define		REBEL_COMMAND_MAX_ACTIONS_PER_REGION		6

Strategic/Reinforcement.cpp

@@ -7,12 +7,12 @@
 	#include "Strategic Town Loyalty.h"
 	#include "Utilities.h"
 	#include "random.h"
-	#include "text.h"
+	#include "Text.h"
 	#include "Map Screen Interface.h"
 	#include "Interface.h"
-	#include "Laptopsave.h"
+	#include "LaptopSave.h"
 	#include "Assignments.h"
-	#include "squads.h"
+	#include "Squads.h"
 	#include "Soldier Create.h"
 	#include "Dialogue Control.h"
 	#include "Queen Command.h"

Strategic/Scheduling.cpp

@@ -1,18 +1,18 @@
 	#include <memory.h>
-	#include "Fileman.h"
+	#include "FileMan.h"
 	#include "types.h"
 	#include "Scheduling.h"
 
 	#include "message.h"
-	#include "overhead.h"
+	#include "Overhead.h"
 	#include "Game Clock.h"
 	#include "Game Event Hook.h"
 	#include "worlddef.h"
 	#include "Soldier Init List.h"
 	#include "Isometric Utils.h"
 	#include "ai.h"
-	#include "debug.h"
-	#include "Random.h"
+	#include "DEBUG.H"
+	#include "random.h"
 	#include "Animation Data.h"
 	#include "Map Information.h"
 	#include "Keys.h"

Strategic/Scheduling.h

@@ -1,7 +1,7 @@
 #ifndef __SCHEDULING_H
 #define __SCHEDULING_H
 
-#include "BuildDefines.h"
+#include "builddefines.h"
 #include "Soldier Init List.h"
 
 //Merc scheduling actions

Strategic/Strategic AI.cpp

@@ -7,7 +7,7 @@
 	#include "Game Event Hook.h"
 	#include "GameSettings.h"
 	#include "Campaign Types.h"
-	#include "Random.h"
+	#include "random.h"
 	#include "Strategic Pathing.h"
 	#include "message.h"
 	#include "strategicmap.h"
@@ -30,7 +30,7 @@
 	#include "Soldier Profile.h"
 	#include "Scheduling.h"
 	#include "Map Information.h"
-	#include "interface dialogue.h"
+	#include "interface Dialogue.h"
 	#include "ASD.h"		// added by Flugente
 	#include "Rebel Command.h"
 	#include "Game Event Hook.h"
@@ -5754,26 +5754,13 @@ void StrategicHandleQueenLosingControlOfSector( INT16 sSectorX, INT16 sSectorY,
 	else
 		return;
 
-	//Madd: tweaked to increase attacks for experienced and expert to 8 and 12, and unlimited for insane
-		UINT8 value9;
-		if( gGameOptions.ubDifficultyLevel == DIF_LEVEL_EASY )
-			value9 = 1;
-		else if( gGameOptions.ubDifficultyLevel == DIF_LEVEL_MEDIUM )
-			value9 = 2;
-		else if( gGameOptions.ubDifficultyLevel == DIF_LEVEL_HARD )
-			value9 = 3;
-		else if( gGameOptions.ubDifficultyLevel == DIF_LEVEL_INSANE )
-			value9 = 4;
-		else
-		{
-			value9 = Random (4);
-			if (value9 == 0) value9 = 1;
-		}
-	
-	if( pSector->ubInvestigativeState >= ( 4 * value9 ) && !zDiffSetting[gGameOptions.ubDifficultyLevel].bQueenLosingControlOfSector )
 	{
-		//This is the 4th time the player has conquered this sector.	We won't pester the player with probing attacks here anymore.
-		return;
+		const auto queenStopsAttacking = zDiffSetting[gGameOptions.ubDifficultyLevel].bQueenLosingControlOfSector;
+		if (queenStopsAttacking != 0 && pSector->ubInvestigativeState >= queenStopsAttacking) {
+			/* This is equal or higher than QueenAttackLosingControlOfSector number of times the player has conquered this sector.
+			   We won't pester the player with probing attacks here anymore. */
+			return;
+		}
 	}
 
 	if( sSectorX != gWorldSectorX || sSectorY != gWorldSectorY )

Strategic/Strategic Event Handler.cpp

@@ -5,20 +5,20 @@
 	#include "Handle Items.h"
 	#include "LaptopSave.h"
 	#include "Tactical Save.h"
-	#include "StrategicMap.h"
+	#include "strategicmap.h"
 	#include "Quests.h"
 	#include "Soldier Profile.h"
 	#include "Game Event Hook.h"
 	#include "Game Clock.h"
-	#include "Interface Dialogue.h"
-	#include "Random.h"
+	#include "interface Dialogue.h"
+	#include "random.h"
 	#include "Overhead.h"
 	#include "Strategic Town Loyalty.h"
 	#include "Soldier Init List.h"
 	#include "SaveLoadMap.h"
 	#include "Soldier Create.h"
 	#include "Soldier Add.h"
-	#include "Renderworld.h"
+	#include "renderworld.h"
 	#include "Soldier Profile.h"
 	#include "email.h"
 	#include "strategic.h"

Strategic/Strategic Event Handler.h

@@ -1,7 +1,7 @@
 #ifndef _STRATEGIC_EVENT_HANDLER_H_
 #define _STRATEGIC_EVENT_HANDLER_H_
 
-#include "Types.h"
+#include "types.h"
 
 #define KINGPIN_MONEY_SECTOR_X	gModSettings.ubKingpinMoneySectorX //5
 #define KINGPIN_MONEY_SECTOR_Y	gModSettings.ubKingpinMoneySectorY //MAP_ROW_D

Strategic/Strategic Merc Handler.cpp

@@ -1,8 +1,8 @@
-	#include "Types.h"
+	#include "types.h"
 
 	#include "Strategic Merc Handler.h"
-	#include "History.h"
-	#include "Game clock.h"
+	#include "history.h"
+	#include "Game Clock.h"
 	#include "insurance Contract.h"
 	#include "Soldier Profile.h"
 	#include "Game Event Hook.h"
@@ -11,15 +11,15 @@
 	#include "Merc Contract.h"
 	#include "Merc Hiring.h"
 	#include "Dialogue Control.h"
-	#include "Random.h"
+	#include "random.h"
 	#include "Morale.h"
-	#include "Mercs.h"
+	#include "mercs.h"
 	#include "Mapscreen.h"
-	#include "weapons.h"
-	#include "Personnel.h"
+	#include "Weapons.h"
+	#include "personnel.h"
 	#include "Strategic Movement.h"
 	#include "LaptopSave.h"
-	#include "Message.h"
+	#include "message.h"
 	#include "Text.h"
 	#include "Interface.h"
 	#include "strategic.h"

Strategic/Strategic Mines LUA.h

@@ -1,7 +1,7 @@
 #ifndef STRATEGIC_MINES_LUA_H
 #define STRATEGIC_MINES_LUA_H
 
-#include "Types.h"
+#include "types.h"
 
 extern "C" {
 #include "lua.h"

Strategic/Strategic Mines.cpp

@@ -1,11 +1,11 @@
-	#include <String.h>
+	#include <string.h>
 	#include "Strategic Mines.h"
-	#include "Finances.h"
+	#include "finances.h"
 	#include "Strategic Town Loyalty.h"
 	#include "strategic.h"
 	#include "Game Clock.h"
 	#include "strategicmap.h"
-	#include "Random.h"
+	#include "random.h"
 	#include "Soldier Profile.h"
 	#include "Dialogue Control.h"
 	#include "Map Screen Interface.h"

Strategic/Strategic Mines.h

@@ -3,7 +3,7 @@
 
 // the .h to the mine management system
 
-#include "Types.h"
+#include "types.h"
 #include "strategicmap.h"
 #include "mapscreen.h"
 

Strategic/Strategic Movement Costs.cpp

@@ -3,7 +3,7 @@
 	#include "Strategic Movement.h"
 	#include "XML.h"
 	#include "expat.h"
-	#include "Debug.h"
+	#include "DEBUG.H"
 	#include "Debug Control.h"
 	#include "Tactical Save.h"
 #include "Map Screen Interface Map.h"

Strategic/Strategic Movement.cpp

@@ -3,33 +3,33 @@
 	#include <memory.h>
 	#include "Strategic Movement.h"
 	#include "MemMan.h"
-	#include "debug.h"
+	#include "DEBUG.H"
 	#include "Campaign Types.h"
 	#include "Game Event Hook.h"
 	#include "Game Clock.h"
 
 	#include "Queen Command.h"
-	#include "overhead.h"
+	#include "Overhead.h"
 	#include "strategicmap.h"
 	#include "jascreens.h"
 	#include "Strategic Pathing.h"
 	#include "Map Screen Interface Map.h"
 	#include "PreBattle Interface.h"
-	#include "Strategic.h"
+	#include "strategic.h"
 	#include "Assignments.h"
 	#include "Text.h"
 	#include "Font Control.h"
 	#include "message.h"
 	#include "mapscreen.h"
-	#include "dialogue control.h"
+	#include "Dialogue Control.h"
 	#include "Soldier Add.h"
 	#include "Game Events.h"
 	#include "Vehicles.h"
 	#include "Map Screen Helicopter.h"
 	#include "Map Screen Interface.h"
 	#include "Squads.h"
-	#include "Random.h"
-	#include "soldier macros.h"
+	#include "random.h"
+	#include "Soldier macros.h"
 	#include "Map Information.h"
 	#include "Tactical Save.h"
 	#include "Player Command.h"
@@ -38,7 +38,7 @@
 	#include "Music Control.h"
 	#include "Campaign.h"
 	#include "Isometric Utils.h"
-	#include "meanwhile.h"
+	#include "Meanwhile.h"
 	#include "Inventory Choosing.h"
 	#include "Map Screen Interface Border.h"
 	#include "Auto Resolve.h"

Strategic/Strategic Pathing.cpp

@@ -5,7 +5,7 @@
 	#include "sgp.h"
 	#include "strategic.h"
 	#include "mapscreen.h"
-	#include "overhead.h"
+	#include "Overhead.h"
 	#include "strategicmap.h"
 	#include "Strategic Pathing.h"
 	#include "Map Screen Interface Border.h"

Strategic/Strategic Status.cpp

@@ -6,7 +6,7 @@
 	#include "Strategic Mines.h"
 	#include "email.h"
 	#include "Game Clock.h"
-	#include "Debug.h"
+	#include "DEBUG.H"
 	#include "GameSettings.h"
 	#include "history.h"
 	#include "Strategic Town Loyalty.h"

Strategic/Strategic Town Loyalty.cpp

@@ -9,16 +9,16 @@
 	#include "Animation Data.h"
 	#include "Quests.h"
 	#include "Font.h"
-	#include "Message.h"
+	#include "message.h"
 	#include "LOS.h"
 	#include "World Items.h"
 	#include "Tactical Save.h"
 	#include "Soldier Profile.h"
 	#include "Handle Items.h"
 	#include "random.h"
-	#include "strategic movement.h"
+	#include "Strategic Movement.h"
 	#include "Strategic Pathing.h"
-	#include "vehicles.h"
+	#include "Vehicles.h"
 	#include "Game Clock.h"
 	#include "Game Event Hook.h"
 	#include "Morale.h"
@@ -27,7 +27,7 @@
 	#include "MessageBoxScreen.h"
 	#include "Town Militia.h"
 	#include "history.h"
-	#include "meanwhile.h"
+	#include "Meanwhile.h"
 	#include "Strategic Status.h"
 	// HEADROCK HAM B1: Added include for Dynamic Roaming Militia
 	#include "MilitiaSquads.h"

Strategic/Strategic Town Loyalty.h

@@ -1,7 +1,7 @@
 #ifndef __STRATEGIC_TOWN_LOYALTY_H
 #define __STRATEGIC_TOWN_LOYALTY_H
 
-#include "Types.h"
+#include "types.h"
 #include "mapscreen.h"
 #include "Soldier Control.h"
 

Strategic/Strategic Transport Groups.h

@@ -2,7 +2,7 @@
 #define _STRATEGIC_TRANSPORT_GROUPS_H
 
 #include "Campaign Types.h"
-#include "Types.h"
+#include "types.h"
 #include <map>
 
 enum TransportGroupSectorInfo

Strategic/Strategic Turns.cpp

@@ -2,20 +2,20 @@
 	#include "Game Clock.h"
 	#include "Font Control.h"
 	#include "Timer Control.h"
-	#include "overhead.h"
+	#include "Overhead.h"
 	#include "Game Clock.h"
 	#include "message.h"
 	#include "worlddef.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 "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 "strategic turns.h"
+	#include "Strategic Turns.h"
 	#include "rt time defines.h"
-	#include "assignments.h"
+	#include "Assignments.h"
 
 
 

Strategic/Town Militia.cpp

@@ -9,21 +9,21 @@
 	#include "Strategic Town Loyalty.h"
 	#include "Utilities.h"
 	#include "random.h"
-	#include "text.h"
+	#include "Text.h"
 	#include "Map Screen Interface.h"
 	#include "Interface.h"
-	#include "Laptopsave.h"
+	#include "LaptopSave.h"
 	#include "finances.h"
 	#include "Game Clock.h"
 	#include "Assignments.h"
-	#include "squads.h"
+	#include "Squads.h"
 	#include "Soldier Create.h"
 	#include "Dialogue Control.h"
 	#include "GameSettings.h"
 	#include "Queen Command.h"
 	#include "PreBattle Interface.h"
 	#include "Map Screen Interface Border.h"
-	#include "interface control.h"
+	#include "Interface Control.h"
 	#include "Map Screen Interface Map.h"
 	#include "laptop.h"							// added by Flugente
 	#include "Game Event Hook.h"				// added by Flugente

Strategic/Town Militia.h

@@ -3,7 +3,7 @@
 
 // header for town militia strategic control module
 
-#include "Types.h"
+#include "types.h"
 #include "Soldier Control.h"
 
 // how many militia of all ranks can be in any one sector at once

Strategic/UndergroundInit.h

@@ -2,7 +2,7 @@
 #define _UNDERGROUNDINIT_H
 
 #include "Campaign Types.h"
-#include "Types.h"
+#include "types.h"
 //#include "Strategic Mines LUA.h"
 
 #include "lua_state.h"

Strategic/XML_ExtraItems.cpp

@@ -2,7 +2,7 @@
 #include <stdio.h>
 #include "XML.h"
 #include "expat.h"
-#include "DEBUG.h"
+#include "DEBUG.H"
 #include "string.h"
 #include "Tactical Save.h"
 #include "FileMan.h"

Strategic/XML_Facilities.cpp

@@ -11,7 +11,7 @@
 	#include "sgp.h"
 	#include "Debug Control.h"
 	#include "expat.h"
-	#include "gamesettings.h"
+	#include "GameSettings.h"
 	#include "XML.h"
 	#include "FileMan.h"
 	#include "Campaign Types.h"

Strategic/XML_FacilityTypes.cpp

@@ -12,7 +12,7 @@
 	#include "sgp.h"
 	#include "Debug Control.h"
 	#include "expat.h"
-	#include "gamesettings.h"
+	#include "GameSettings.h"
 	#include "XML.h"
 	#include "FileMan.h"
 	#include "Campaign Types.h"

Strategic/XML_SquadNames.cpp

@@ -1,6 +1,6 @@
 	#include "sgp.h"
 	#include "Map Screen Interface.h"
-	#include "overhead.h"
+	#include "Overhead.h"
 	#include "Debug Control.h"
 	#include "expat.h"
 	#include "XML.h"

Strategic/mapscreen.cpp

@@ -5,13 +5,13 @@
 	#include "gameloop.h"
 	#include "sgp.h"
 	#include "vobject.h"
-	#include "wcheck.h"
+	#include "WCheck.h"
 	#include "worlddef.h"
 	#include "input.h"
-	#include "font.h"
+	#include "Font.h"
 	#include "screenids.h"
-	#include "screens.h"
-	#include "overhead.h"
+	#include "Screens.h"
+	#include "Overhead.h"
 	#include "sysutil.h"
 	#include "Event Pump.h"
 	#include "Font Control.h"
@@ -19,18 +19,18 @@
 	#include "Interface.h"
 	#include "Handle UI.h"
 	#include "Interface Items.h"
-	#include "interface utils.h"
+	#include "Interface Utils.h"
 	#include "lighting.h"
 	#include <wchar.h>
 	#include <tchar.h>
-	#include "cursors.h"
+	#include "Cursors.h"
 	#include "Soldier Profile.h"
 	#include "Interface Panels.h"
 	#include "Interface Control.h"
-	#include "sys globals.h"
+	#include "Sys Globals.h"
 	#include "Radar Screen.h"
 	#include "Render Dirty.h"
-	#include "utilities.h"
+	#include "Utilities.h"
 	#include "Game Init.h"
 	#include "renderworld.h"
 	#include "finances.h"
@@ -41,26 +41,26 @@
 	#include "faces.h"
 	#include "PopUpBox.h"
 	#include "Game Clock.h"
-	#include "items.h"
+	#include "Items.h"
 	#include "Cursor Control.h"
-	#include "text.h"
+	#include "Text.h"
 	#include "strategic.h"
 	#include "strategicmap.h"
-	#include "strategic pathing.h"
+	#include "Strategic Pathing.h"
 	#include "Map Screen Interface Bottom.h"
 	#include "Map Screen Interface Border.h"
 	#include "Map Screen Interface Map.h"
 	#include "Map Screen Interface.h"
 	#include "Assignments.h"
-	#include "points.h"
+	#include "Points.h"
 	#include "Squads.h"
 	#include "Merc Contract.h"
 	#include "Sound Control.h"
-	#include "strategic turns.h"
+	#include "Strategic Turns.h"
 	#include "Dialogue Control.h"
 	#include "Map Screen Interface TownMine Info.h"
 	#include "PreBattle Interface.h"
-	#include "Personnel.h"
+	#include "personnel.h"
 	#include "Animated ProgressBar.h"
 	#include "Queen Command.h"
 	#include "LaptopSave.h"
@@ -75,19 +75,19 @@
 	#include "SaveLoadScreen.h"
 	#include "Options Screen.h"
 	#include "Auto Resolve.h"
-	#include "meanwhile.h"
+	#include "Meanwhile.h"
 	#include "Campaign.h"
-	#include "Random.h"
+	#include "random.h"
 	#include "Air Raid.h"
-	#include "quests.h"
+	#include "Quests.h"
 	#include "Town Militia.h"
-	#include "weapons.h"
+	#include "Weapons.h"
 	#include "Player Command.h"
 	#include "Multi Language Graphic Utils.h"
 	#include "HelpScreen.h"
 	#include "Soldier macros.h"
 	#include "Map Information.h"
-	#include "cheats.h"
+	#include "Cheats.h"
 	#include "Strategic Town Loyalty.h"
 	#include "GameSettings.h"
 	#include "Militia Control.h"
@@ -11907,12 +11907,12 @@ void TeamListSleepRegionBtnCallBack( MOUSE_REGION *pRegion, INT32 iReason )
 				if( pSoldier->flags.fMercAsleep == TRUE )
 				{
 					// try to wake him up
-					if( SetMercAwake( pSoldier, TRUE, FALSE ) )
+					if( SetMercAwake( pSoldier, gGameExternalOptions.fSleepDisplayFailNotification, FALSE ) )
 					{
 						// HEADROCK HAM B2.8: New feature wakes all trainees/trainers automatically
 						HandleTrainingWakeSynchronize( pSoldier );
 						// propagate
-						HandleSelectedMercsBeingPutAsleep( TRUE, TRUE );
+						HandleSelectedMercsBeingPutAsleep( TRUE, gGameExternalOptions.fSleepDisplayFailNotification);
 						return;
 					}
 					else
@@ -11929,7 +11929,7 @@ void TeamListSleepRegionBtnCallBack( MOUSE_REGION *pRegion, INT32 iReason )
 						// HEADROCK HAM B2.8: New feature sends all trainees/trainers to sleep automatically
 						HandleTrainingSleepSynchronize( pSoldier );
 						// propagate
-						HandleSelectedMercsBeingPutAsleep( FALSE, TRUE );
+						HandleSelectedMercsBeingPutAsleep( FALSE, gGameExternalOptions.fSleepDisplayFailNotification);
 						return;
 					}
 					else

Strategic/mapscreen.h

@@ -2,7 +2,7 @@
 #define __MAPSCREEN_H
 
 
-#include "Types.h"
+#include "types.h"
 #include "Soldier Control.h"
 
 #define			MAP_WORLD_X						18

Strategic/strategic town reputation.cpp

@@ -1,12 +1,12 @@
 	#include "types.h"
 	#include "strategic town reputation.h"
 	#include "soldier profile type.h"
-	#include "game event hook.h"
+	#include "Game Event Hook.h"
 	#include "Soldier Profile.h"
 	#include "Overhead.h"
 	#include "Game Clock.h"
-	#include "strategic town loyalty.h"
-	#include "Debug.h"
+	#include "Strategic Town Loyalty.h"
+	#include "DEBUG.H"
 	#include "message.h"
 
 

Strategic/strategic.cpp

@@ -1,5 +1,5 @@
-	#include "Strategic.h"
-	#include "Types.h"
+	#include "strategic.h"
+	#include "types.h"
 	#include "Squads.h"
 	#include "jascreens.h"
 	#include "Assignments.h"
@@ -13,7 +13,7 @@
 	#include "Vehicles.h"
 	#include "Game Clock.h"
 	#include "CampaignStats.h"		// added by Flugente
-	#include "militiasquads.h"		// added by Flugente
+	#include "MilitiaSquads.h"		// added by Flugente
 	#include "Game Event Hook.h"	// added by Flugente
 	#include "message.h"			// added by Flugente
 	#include "Text.h"				// added by Flugente

Strategic/strategic.h

@@ -1,9 +1,9 @@
 #ifndef __STRATEGIC_H
 #define __STRATEGIC_H
 // header for strategic structure
-#include "Types.h"
+#include "types.h"
 #include "mapscreen.h"
-#include "soldier control.h"
+#include "Soldier Control.h"
 
 // Flugente: airspace flags
 #define AIRSPACE_ENEMY_ACTIVE				0x01	//1		// controlled by enemy and active

Strategic/strategicmap.cpp

@@ -12,24 +12,24 @@
 #include "jascreens.h"
 #include "worlddef.h"
 #include "Soldier Control.h"
-#include "overhead.h"
-#include "interface panels.h"
-#include "isometric utils.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"
-#include "Soldier add.h"
-#include "soldier macros.h"
+#include "WorldDat.h"
+#include "Text.h"
+#include "Soldier Add.h"
+#include "Soldier macros.h"
 #include "Strategic Pathing.h"
-#include "soldier create.h"
-#include "handle UI.h"
+#include "Soldier Create.h"
+#include "Handle UI.h"
 #include "faces.h"
 #include "renderworld.h"
 #include "gamescreen.h"
-#include "game clock.h"
+#include "Game Clock.h"
 #include "Soldier Init List.h"
-#include "strategic turns.h"
+#include "Strategic Turns.h"
 #include "merc entering.h"
 #include "Map Information.h"
 #include "Assignments.h"
@@ -37,50 +37,50 @@
 #include "Font Control.h"
 #include "environment.h"
 #include "Game Events.h"
-#include "quests.h"
+#include "Quests.h"
 #include "FileMan.h"
-#include "animated progressbar.h"
-#include "music control.h"
-#include "fade screen.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 "Sys Globals.h"
 #include "Exit Grids.h"
 #include "Tactical Save.h"
-#include "pathai.h"
-#include "animation control.h"
-#include "squads.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 "Cursor Control.h"
 #include "PreBattle Interface.h"
 #include "Shade Table Util.h"
 #include "Scheduling.h"
 #include "gameloop.h"
-#include "Random.h"
+#include "random.h"
 #include "ai.h"
 #include "opplist.h"
-#include "keys.h"
+#include "Keys.h"
 #include "Tactical Placement GUI.h"
 #include "Map Screen Helicopter.h"
-#include "map edgepoints.h"
+#include "Map Edgepoints.h"
 #include "Player Command.h"
 #include "Event Pump.h"
-#include "meanwhile.h"
-#include "air raid.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 "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 "Points.h"
+#include "Render Dirty.h"
 #include "Debug Control.h"
 #include "expat.h"
 #include "Loading Screen.h"
@@ -89,14 +89,14 @@
 #include "NPC.h"
 #include "Strategic Event Handler.h"
 #include "MessageBoxScreen.h"
-#include "interface dialogue.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"
+#include "Cursors.h"
 #include "GameVersion.h"
 
 #include "LuaInitNPCs.h"
@@ -408,8 +408,8 @@ UINT32 uiBuildShadeTableTime;
 UINT32 uiNumTablesSaved;
 UINT32 uiNumTablesLoaded;
 UINT32 uiNumImagesReloaded;
-#include "render dirty.h"
-#include "tiledat.h"
+#include "Render Dirty.h"
+#include "TileDat.h"
 #endif
 
 // SAM externalization stuff
@@ -6610,7 +6610,7 @@ BOOLEAN CheckAndHandleUnloadingOfCurrentWorld( )
 		for ( SoldierID i = gTacticalStatus.Team[OUR_TEAM].bFirstID; i <= gTacticalStatus.Team[OUR_TEAM].bLastID; ++i )
 		{ //If we have a live and valid soldier
 			SOLDIERTYPE *pSoldier = i;
-			if ( pSoldier->bActive && pSoldier->stats.bLife && !pSoldier->flags.fBetweenSectors && !(pSoldier->flags.uiStatusFlags & SOLDIER_VEHICLE) && !AM_A_ROBOT( pSoldier ) && !AM_AN_EPC( pSoldier ) )
+			if ( pSoldier->bActive && pSoldier->stats.bLife && !pSoldier->flags.fBetweenSectors && pSoldier->bInSector && !(pSoldier->flags.uiStatusFlags & SOLDIER_VEHICLE) && !AM_A_ROBOT( pSoldier ) && !AM_AN_EPC( pSoldier ) )
 			{
 				if ( pSoldier->sSectorX == gWorldSectorX &&
 					 pSoldier->sSectorY == gWorldSectorY &&

Strategic/strategicmap.h

@@ -2,7 +2,7 @@
 #define __STRATMAP_H
 // this file is for manipulation of the strategic map structure
 #include "types.h"
-#include "soldier control.h"
+#include "Soldier Control.h"
 #include "FileMan.h"
 
 #include "mapscreen.h"